Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 22568)
+++ applications/editors/josm/i18n/po/ar.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-11 20:41+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 12:34+0000\n"
 "Last-Translator: bastik <Unknown>\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-07-28 09:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -24,5 +24,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -53,14 +53,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -77,9 +76,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -122,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -160,5 +159,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -226,5 +225,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -240,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -258,11 +257,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -270,20 +270,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -316,5 +316,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "إدمج"
@@ -382,5 +382,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -394,5 +394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -414,4 +414,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -428,6 +429,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -439,5 +440,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -572,22 +573,22 @@
 msgstr "جاري تنزيل  حزمات تغييرات مفتوحة"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "ادمج الطريق"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "ادمج عدة طرق في طريق واحدة."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "غيّر الإتجاه ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "أعكس  ثم إدمج"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -595,5 +596,5 @@
 msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -601,10 +602,10 @@
 msgstr "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "ادمج {0} طرقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "الرجاء إختر على الأقل طريقتين للدمج."
@@ -649,10 +650,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -790,5 +791,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -854,10 +855,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "صدّر إلى GPX ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "صدّر المعطيات إلى ملف GPX..."
@@ -1047,5 +1048,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr ""
@@ -1458,20 +1459,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1495,5 +1496,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1504,6 +1505,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "خطأ"
@@ -1530,5 +1531,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1536,5 +1537,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "إحفظ المعطيات الحالية."
@@ -1589,10 +1590,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "إحفظ كــ ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "إحفظ المعطيات الحالية في ملف جديد."
@@ -1635,5 +1636,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1660,5 +1661,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr ""
@@ -1727,18 +1728,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "إنّ العقد المختارة لا تتقاسم نفس الطريق."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1750,5 +1756,5 @@
 msgstr[5] "إنّ العقد المختارة ليست موجودة في وسط أي طريق."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1760,20 +1766,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "إنّ العقد المختارة لا تتقاسم نفس الطريق."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1781,5 +1777,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1787,5 +1783,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1793,5 +1789,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1935,5 +1931,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2893,22 +2889,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3049,25 +3045,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#, java-format
+msgid "Delete node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#, java-format
+msgid "Delete way {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
-msgid "Delete node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
-#, java-format
-msgid "Delete way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
-#, java-format
 msgid "Delete relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3076,5 +3072,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3083,5 +3079,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3090,5 +3086,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3097,5 +3093,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3245,5 +3241,5 @@
 msgstr "طبّق ؟"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3326,7 +3322,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "خطء حين إنشاء مجلد الخابية: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3496,42 +3492,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "درجات دقائق ثواني"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "ج."
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "ش."
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "غ."
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "ش."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3539,5 +3538,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3718,5 +3717,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "الخلفية"
@@ -3860,5 +3859,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr ""
@@ -3886,5 +3885,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "خط سكة حديد"
@@ -3906,6 +3905,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -3978,5 +3977,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr ""
@@ -4063,5 +4062,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4156,69 +4155,69 @@
 msgstr "كلمة‌المرور"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "الإستعمال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "الخيارات"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "أعرض هذه المساعدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4228,9 +4227,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "أمثال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4238,46 +4237,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "جاري التهيئة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "حلّ"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4286,5 +4284,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4380,33 +4378,33 @@
 msgstr "صغّر الرؤية"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "المقياس"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "خطّ الطول عند مؤشر الفأرة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "إسم الغرض عند مؤشر الفأرة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "خطّ العرض عند مؤشر الفأرة."
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+msgid "The angle between the previous and the current way segment."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
-msgid "The angle between the previous and the current way segment."
+msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4414,9 +4412,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(لا يوجد أي غرض)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4432,4 +4430,18 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+msgid "Metric"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "صيني"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "تجاري"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5137,5 +5149,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "الكلّ"
@@ -5218,6 +5230,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5232,5 +5244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5359,5 +5371,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr ""
@@ -5418,5 +5430,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5575,5 +5587,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5581,5 +5593,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5587,5 +5599,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5593,5 +5605,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5599,5 +5611,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5606,5 +5618,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5612,5 +5624,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5618,5 +5630,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5624,24 +5636,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5721,51 +5733,51 @@
 msgstr "أغلق الحوار، لا تأنشئ عقدة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "الطبقات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "إفتح لائحة بكلّ التبقات المحملة."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "عرض/إخفاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr ""
@@ -5775,5 +5787,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "العلاقات"
@@ -6926,6 +6938,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6973,107 +6986,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "الإسم"
@@ -7411,5 +7424,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7496,5 +7509,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<مختلف>"
@@ -8221,5 +8234,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8292,8 +8305,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "النوع"
@@ -8322,6 +8335,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "مجهول"
@@ -8642,5 +8655,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr ""
@@ -8699,14 +8712,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "ادخل تعليقك"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9137,5 +9151,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9157,5 +9171,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9163,60 +9177,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "حمّل التغييرات"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "مراجعة"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "تابع"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "لا تظهر مرة اخرى"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9536,103 +9582,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "نقطة gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "إستعمل الإعدادات العامة."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "حدد خيارات رسم الخطوط"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "خصّص اللون"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "الغيابي"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "إختر لون"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "إستورد صوت مسجل"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "ملفات صوتيت (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "العلامات الصوتية من {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "إستورد صور"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9640,5 +9594,5 @@
 msgstr "الإسم: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9646,5 +9600,5 @@
 msgstr "الوصف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9654,23 +9608,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "الطول: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9679,5 +9633,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9686,10 +9640,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9699,21 +9653,21 @@
 "مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "محوّل من: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9721,10 +9675,10 @@
 msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "نزّل كلّ شيئ بين:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9732,10 +9686,10 @@
 msgstr "{0} أمتار"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "المساحة القصوى للمطلب:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9743,21 +9697,21 @@
 msgstr "{0} كلم²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9767,9 +9721,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9777,5 +9731,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9783,23 +9737,115 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "إستعمل الإعدادات العامة."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "حدد خيارات رسم الخطوط"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "خصّص اللون"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "الغيابي"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "إختر لون"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "إستورد صوت مسجل"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "ملفات صوتيت (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "العلامات الصوتية من {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "إستورد صور"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "طبقة المعطيات {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "خارج عن المنطقة المنزلة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9808,11 +9854,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9821,36 +9867,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} يتألف من:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9858,5 +9904,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9865,5 +9911,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -9875,5 +9921,5 @@
 msgstr[5] "نقاط"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -9882,5 +9928,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -9889,5 +9935,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -9900,24 +9946,28 @@
 msgstr[5] "{0} نقطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "خطء عند تحليل {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "لم أتمكن من قراءة \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9926,34 +9976,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -9961,93 +10011,93 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10057,20 +10107,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10079,5 +10129,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10085,21 +10135,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10107,17 +10157,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10126,5 +10176,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10133,56 +10183,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "جاري قراءة {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10191,5 +10237,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10198,10 +10244,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10210,5 +10256,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10304,9 +10350,9 @@
 msgstr "صور  (*.jpg)JPEG"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10318,5 +10364,5 @@
 msgstr[5] "دالات"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10325,14 +10371,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "مزامنة الصوت"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10340,29 +10398,17 @@
 msgstr "تمّت مزامنة الصوت على النقطة {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
@@ -11205,4 +11251,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr ""
@@ -11217,5 +11264,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11318,5 +11365,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11324,5 +11371,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "فقط على رأس الطريق."
@@ -11352,5 +11399,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "المؤلف"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Both"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11358,9 +11418,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11368,29 +11428,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "الطول الأقصى (أمتار)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11398,5 +11458,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11404,13 +11464,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "المسافة الأدنى (نقاط)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "أرسم نقاط أكبر لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11418,9 +11478,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11428,46 +11488,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "تلوين الأثر و النقطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "نقاط جهاز تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "المعطيات أو.أس.أم"
@@ -11822,21 +11890,25 @@
 "يجب عليك إعادة بدء تشغيل ج.أو.أس.أم كي تُأخذ بعض التغييرات بعين الإعتبار."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "منهج الإسقاط"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "أعرض الإحداثيات كــ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "منهج الإسقاط"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+msgid "System of measurement"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "إسقاط الخريطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12379,5 +12451,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12386,49 +12458,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "مزيد من المعلومات عن هذه الميزة"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "ميزات خيارية:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "نوع غير معروف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12438,15 +12510,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "خطأ في التحليل النحوي  {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "العناصر من الفصيلة {0} هي مدعومة"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12460,17 +12532,17 @@
 msgstr[5] "غيّر {0} غرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "الخيار فارغ !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "الخيار غير مناسب !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "طبّق الخيار المسبق"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12488,7 +12560,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "إبحث"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12497,7 +12568,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "بحث عن أغراض."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
@@ -12506,7 +12576,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "بحث عن أغراض."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12803,5 +12872,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -14237,5 +14306,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14501,5 +14570,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "إستيفاء العنوان"
@@ -14841,41 +14910,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -14892,25 +14961,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -14948,18 +15017,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "مباني"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15183,8 +15252,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "الماء"
@@ -15245,6 +15314,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "العنوان"
@@ -15710,34 +15779,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15746,14 +15815,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "خطء في صيغة المعطيات"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -15830,22 +15899,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "موقع التنزيل"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "نزّل المساحة"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -15860,7 +15925,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "نوع   الطلاء   {0}:{1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -15891,9 +15956,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15903,5 +15968,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -15910,11 +15975,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr ""
@@ -15924,5 +15989,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr ""
@@ -15932,13 +15997,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16177,5 +16242,5 @@
 msgstr ""
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr ""
@@ -16524,8 +16589,6 @@
 msgstr ""
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr ""
@@ -16556,5 +16619,5 @@
 msgstr "الزاوية بين عقدتين محددتين"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr ""
@@ -16646,5 +16709,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -16708,13 +16771,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -16826,93 +16889,93 @@
 msgstr ""
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -16954,9 +17017,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17134,20 +17197,24 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "read protocol version"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "التحم عن بعد"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17156,50 +17223,58 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "الأفعال المسموح بها"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "هل تريد السماح بذلك ؟"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17207,5 +17282,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "إسترجع"
@@ -17404,41 +17479,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -17738,4 +17813,14 @@
 msgid "Terrace"
 msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "الفاصل"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18422,6 +18507,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18431,9 +18516,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18512,6 +18597,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18519,5 +18604,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr ""
@@ -18763,7 +18848,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "أرض سكة حديد"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
@@ -18812,5 +18896,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
@@ -19327,5 +19411,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr ""
@@ -19461,10 +19545,10 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19610,10 +19694,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -19799,28 +19883,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -19831,64 +19911,68 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
 msgstr ""
 
@@ -19968,5 +20052,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -19999,5 +20083,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20018,5 +20102,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "غابة"
@@ -20035,71 +20119,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "الحدود"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "الفلق الأمامي"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "خط أنابيب"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "متعدد الضلوع"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "الشبكة"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "خرائط_النقل_العام"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "حصر"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "طريق"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "ألصِق"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "مجرى مياه"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20373,7 +20447,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20570,6 +20643,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20578,5 +20656,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20585,5 +20663,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20592,10 +20670,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20604,5 +20682,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20612,5 +20690,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20619,15 +20697,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20636,5 +20714,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20767,5 +20845,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr ""
@@ -21304,5 +21382,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21315,5 +21393,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "غابة/حرش"
@@ -21617,9 +21695,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr ""
@@ -21729,9 +21807,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr ""
@@ -21990,5 +22068,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr ""
@@ -22037,5 +22115,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr ""
@@ -22070,5 +22148,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr ""
@@ -22155,5 +22233,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr ""
@@ -22188,5 +22266,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22356,14 +22434,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "شركة الإدارة"
@@ -22631,6 +22709,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "إرتفاع"
@@ -23078,5 +23156,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
@@ -23482,5 +23560,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "التوتر"
@@ -23844,31 +23922,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "أزقات الإفتتاح"
@@ -23928,90 +24006,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24124,7 +24202,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "الرقم المرجعي"
@@ -24140,5 +24218,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "تحت الأرض"
@@ -24151,6 +24229,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "رسم دخول/إجرة"
@@ -24326,5 +24404,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "مناسب لكرسي المقعدين"
@@ -24361,6 +24439,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "ملجأ"
@@ -24368,5 +24446,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr ""
@@ -24485,5 +24563,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "عمود إضائة"
@@ -24644,5 +24722,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "الطبخ"
@@ -24650,73 +24728,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "إيطالي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "صيني"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "معجنات إيطالية (بيزا)"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "هامبرغر"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "يوناني"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "ألماني"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "هندي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "محلي/إقليمي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "كباب / شورما"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "تركي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "آسيوي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "تايلاندي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "مكسيكي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "ياباني"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "وجبات سريعة"
@@ -24724,17 +24807,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "حرّر مطعم وجبات السريعة"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "مقهى إستراحة"
@@ -24742,9 +24825,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "حرّر مقهى إستراحة"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "حانة"
@@ -24752,18 +24835,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "حرّر حانة"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "حانة شرب الجعة"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "حرّر حانة شرب الجعة"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "حانة"
@@ -24771,9 +24855,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "حرّر حانة"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "نادي سهر / نادي ليلي"
@@ -24781,24 +24865,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "حرّر نادي سهر/ نادي ليلي"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "سياحة"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "متحف"
@@ -24806,9 +24890,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "حرّر متحف"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "حديقة حيوانات"
@@ -24817,9 +24901,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "حرّر حديقة حيوانات"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "موقع كاشف"
@@ -24827,24 +24911,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "برج مراقبة"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "أعمال فنية"
@@ -24852,5 +24936,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "حرّر أعمال فنية"
@@ -24858,19 +24942,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "مكتب إستعلامات"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "الخريطة"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -24908,5 +24992,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24914,28 +24998,28 @@
 msgstr "شارع"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -24945,5 +25029,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -24951,5 +25035,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr ""
@@ -24957,6 +25041,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "ركب الدراجة"
@@ -24964,5 +25048,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -24970,6 +25054,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "تزلّج"
@@ -24977,5 +25061,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -24983,46 +25067,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "لوحة معلومات"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "التاريخ"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "الطبيعة"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "الحيوانات الضارة"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25030,29 +25121,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "حرّر ملجأ"
@@ -25060,25 +25151,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "موقع تنزه"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "حرّر موقع تنزه"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "مواقع تاريخية"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "قلعة"
@@ -25087,19 +25178,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "حرّر قلعة"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "أطلال"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "حرّر أطلال"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "موقع أثري"
@@ -25108,9 +25199,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "حرّر موقع أثري"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "ساحة معركة"
@@ -25118,10 +25209,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "حرّر ساحة معركة"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25129,5 +25220,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25135,15 +25226,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "نصب تذكاري"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "ضريح"
@@ -25151,55 +25242,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "حرّر ضريح"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "ضريح/مزار"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "حرّر مزار/ضريح"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "وقت الفراغ"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "حرّر حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "ملعب"
@@ -25207,35 +25298,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "حرّر ملعب"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "صيد السمك"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "حرّر صيد السمك"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "المرافق الرياضية"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "مدرج ألعاب رياضية"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "حرّر مدرج ألعاب رياضية"
@@ -25249,6 +25340,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "إختر الرياضة :"
@@ -25664,31 +25755,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "الرياضة"
@@ -25698,240 +25789,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "متعدد"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "أسلحة الرماية"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "كرة القدم الأوسترالية"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "كرة المضرب"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "كرة السلّة"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "التسلق"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "ركوب الدراجة"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "سبق الكلاب"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "ركوب الخيل"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "الجمباز"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "سبق الخيل"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "رياضة المحركات"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "التزلج"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "كرة القدم"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "السباحة"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "تنس الطاولة"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "التنس"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "مركز/نادي  رياضي"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "حرّر مركز/نادي رياضي"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "رياضة"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "متعدد"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr ""
@@ -25973,23 +26064,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "النوع"
@@ -26031,211 +26122,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "مركز/نادي رياضي"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "مدرج ألعاب رياضية"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "سلاح الرامي"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "حرّر سلاح الرامي"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "تسلق"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "حرّر تسلق"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "غدف"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "حرّر غدف"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "حرّر ركب الدراجة"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "سباق الكلاب"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "حرّر سباق الكلاب"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "فروسي"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "حرّر فروسي"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "سباق الخيل"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "حرّر سباق الخيل"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "رياضة بدنية"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "حرّر رياضة بدنية"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "رياضة المحركات"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "حرّر رياضة المحركات"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "تزحلق"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "حرّر تزحلق"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "سباحة"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "حرّر سباحة"
@@ -26243,52 +26334,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "حرّر تزلّج"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "نزولاً"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "شمالي"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "الصعوبة"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "مبتدئ"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "سهل"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "خبير"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "رماية"
@@ -26296,204 +26387,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "حرّر رماية"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "رياضة (كرة)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "تنس الطاولة"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "حرّر تنس الطاولة"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "تنس"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "حرّر تنس"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "مبنى"
@@ -26501,5 +26592,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -26507,10 +26598,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "حرّر مبنى عام"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "مبنى البلدية"
@@ -26518,10 +26609,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "حرّر مبنى البلدية"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "سفارة"
@@ -26529,10 +26620,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "حرّر سفارة"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "محكمة"
@@ -26541,10 +26632,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "حرّر محكمة"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "سجن"
@@ -26553,10 +26644,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "حرّر سجن"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "شرطة"
@@ -26566,10 +26657,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "حرّر شرطة"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "فوج إطفاء"
@@ -26578,10 +26669,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "حرّر فوج إطفاء"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -26589,5 +26680,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "حرّر مكتب البريد"
@@ -26595,15 +26686,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "مدرسة"
@@ -26611,10 +26702,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "حرّر مدرسة"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "جامعة"
@@ -26622,10 +26713,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "حرّر جامعة"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "كلّية"
@@ -26633,5 +26724,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "حرّر كلّية"
@@ -26639,5 +26730,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "سينما"
@@ -26646,10 +26737,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "حرّر سينما"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "مكتبة"
@@ -26658,9 +26749,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "حرّر مكتبة"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -26668,10 +26759,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "حرّر مركز ثقافي"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "مسرح"
@@ -26680,10 +26771,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "حرّر مسرح"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "معبد"
@@ -26693,5 +26784,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "حرّر معبد"
@@ -26700,6 +26791,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "الديانة"
@@ -26708,66 +26799,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "بهائي"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "بوذي"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "نصراني"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "هندوس"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "يهودي"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "مسلم"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "سيخ"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "روحاني"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "الطقوس الدينية"
@@ -26776,81 +26867,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "معمداني"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "كثليك"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "إنجيلي"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "شهود يهوه"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "لوثري"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "منهجي"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "أرثدكس"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "بروتستاني"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "شيعي"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "سنّي"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "عناوين"
@@ -26859,5 +26950,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "حرّر معلومات عنوان"
@@ -26865,5 +26956,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "رقم المنزل"
@@ -26871,25 +26962,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "تسمية المنزل"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "إسم الشارع"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "إسم المدينة"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "الرمز البريدي"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "رمز البلد"
@@ -26898,5 +26989,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "حرّر إستيفاء العنوان"
@@ -26904,61 +26995,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "مخطط الترقيم"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "مفرد"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "مثنى"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "من صنع الإنسان"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "المصانع"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "برج"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -26966,25 +27057,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "خزان / برج مياه"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "منارة"
@@ -26992,10 +27083,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "حرّر منارة"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -27003,10 +27094,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "حرّر طاحونة هوائية"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -27015,41 +27106,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "حرّر خط أنابيب"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "غاز"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "محطّة تكرير مياه"
@@ -27059,10 +27150,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "حرّر محطّة تكرير مياه"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "ونش"
@@ -27070,5 +27161,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "حرّر ونش"
@@ -27076,10 +27167,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "حرّر عمود إضاءة"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -27087,10 +27178,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -27098,23 +27189,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "حرّر كامرة مراقبة"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -27124,35 +27215,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "حرّر مولد طاقة"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "أرياح"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "مائية"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "طاقة أحفورية"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "نووية"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "فحم"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "كهرباء شمسية"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -27161,10 +27252,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "حرّر محطة توليد طاقة"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -27173,5 +27264,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "حرّر محطة طاقة فرعية"
@@ -27179,10 +27270,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "رقم الخط"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "عمود كهربائي"
@@ -27193,23 +27284,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
@@ -27218,21 +27309,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "خط أنابيب"
-
-#: build/trans_presets.java:2452
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27240,55 +27330,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "خدمات/نافعات"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "مراحيض"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "الملاحظة"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "صندوق بريد"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "هاتف"
@@ -27297,5 +27387,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "حرّر هاتف"
@@ -27303,5 +27393,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "عملات معدنية"
@@ -27309,5 +27399,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "الملاحظات"
@@ -27315,5 +27405,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27321,5 +27411,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr ""
@@ -27327,15 +27417,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "بطاقات إعتماد"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -27344,5 +27434,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "حرّر إعادة تصنيع الأشياء"
@@ -27350,35 +27440,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "بطاريات"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "علب (معدنية)"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "ملابس"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27386,5 +27476,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27393,31 +27483,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr ""
@@ -27496,39 +27586,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "خضار"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27537,30 +27627,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "الإرتفاع"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "منخفض"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "نصف"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "ملء"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "مخبئ"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "نافورة"
@@ -27569,10 +27659,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "حرّر نافورة"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -27581,10 +27671,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "حرّر ماء شفة"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -27593,5 +27683,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27599,5 +27689,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr ""
@@ -27605,15 +27695,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "مَتاجر/دكاكين"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -27621,10 +27711,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "حرّر متجر سيارات"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -27633,28 +27723,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "حرر مبيع قطع دراجات"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "سوبرماركت"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "حرّر سوبرماركت"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr ""
@@ -27662,9 +27752,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "كشك"
@@ -27672,27 +27762,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "حرّر كشك"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "جزار"
@@ -27700,9 +27790,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "حرّر جزار"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "خباز"
@@ -27710,9 +27800,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "حرّر خباز"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "بائع الزهور"
@@ -27720,18 +27810,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "حرّر بائع الزهور"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "مأكولات عضوية"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "حرّر مبيع مأكولات عضوية"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr ""
@@ -27739,54 +27829,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "مشروبات"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "حاسوب"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "حرّر مبيع قطع حاسوب"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "إلكترونيات"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "حرّر إلكترونيات"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "حرّر مبيع Hifi"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "أثاث/فرش"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "حرّر مبيع فرش/أثاث"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr ""
@@ -27794,9 +27884,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "خردوات/أدوات منزلية"
@@ -27804,9 +27894,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "حرّر مخزن خردوات/أدوات منزلية"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -27814,54 +27904,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "قرطاسية"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "حرّر مبيع قرطاسية"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "حلاق"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "حرّر حلاق"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "أحذية"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "حرّر أحذية"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "ألعاب"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "حرّر مبيع ألعاب"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "مرئيّات"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "حرّر مبيع مرئيّات"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "تنظيف جاف"
@@ -27869,9 +27959,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "حرّر تنظيف جاف"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "مصبغة/غسيل"
@@ -27879,9 +27969,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "حرّر مصبغة/غسيل"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "نشاطات في الخلاء"
@@ -27889,24 +27979,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "حرّر متجر نشاطات في الخلاء"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "حرّر نظاراتي"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -27914,5 +28004,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr ""
@@ -27920,97 +28010,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "نوعية المبيعات"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "تذاكر_النقل_العام"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "مأكولات"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "مشروبات"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "حلويات"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "سجائر"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "صور"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "جرائد"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "ألعاب"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "طوابع"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "قسائم تعبئة هاتفية"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "قسائم"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "مانع الحمل"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "سدادات قطنية"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "نقود/أموال"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "مصرف"
@@ -28018,14 +28108,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "حرّر مصرف"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "صرّاف آلي"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -28033,5 +28123,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "حرّر صرّاف"
@@ -28039,15 +28129,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "حرّر صراف آلي"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "صحة"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "أطباء"
@@ -28055,18 +28145,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "حرّر أطباء"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -28074,5 +28164,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "حرّر صيدلية"
@@ -28080,9 +28170,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "مستشفى"
@@ -28090,10 +28180,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "حرّر مستشفى"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -28102,5 +28192,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "حرّر نقطة دخول طوارئ"
@@ -28109,20 +28199,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "إستعمل رمز دولي مثل 12-345-67890"
@@ -28130,5 +28220,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "بيطري"
@@ -28137,64 +28227,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "حرّر بيطري"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "الأماكن"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "قارة"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "وطن"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "حرّر وطن"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "دولة/ولاية"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "قطر/منطقة"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr ""
@@ -28202,15 +28292,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "مدينة"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "بلدة"
@@ -28218,10 +28308,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "حرّر بلدة"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "ضاحية"
@@ -28229,25 +28319,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "حرّر ضاحية"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "قرية"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
@@ -28255,5 +28345,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "محلة"
@@ -28261,10 +28351,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "حرّر محلة"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "جزيرة"
@@ -28272,10 +28362,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "حرّر جزيرة"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -28283,5 +28373,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -28289,5 +28379,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "مدخل كهف"
@@ -28295,10 +28385,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "حرّر مدخل كهف"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "قمّة"
@@ -28306,10 +28396,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "حرّر قمّة"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "جليد"
@@ -28317,10 +28407,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "حرّر جليد"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "بركان"
@@ -28328,70 +28418,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "حرّر بركان"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "الحدود"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "دولية"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "حرّر حدود دولية"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "إدارية"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "مدنية"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "حرّر الحدود السياسية"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "محمية وطنية (بيئية)"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "حرّر محمية وطنية (التنوع البيئي)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "شجرة"
@@ -28400,15 +28490,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "حرّر شجرة"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "حرّر اإسم النباتي"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "حرج"
@@ -28417,5 +28507,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "حرّر حرج"
@@ -28423,17 +28513,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "صنوبري الثمر"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "مختلط"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "غابة"
@@ -28442,14 +28532,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "حرّر غابة"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "محمية طبيعية"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "حرّر محمية طبيعية"
@@ -28457,25 +28547,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "حصاة"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "حرّر حصاة"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "أشجار منخفضة"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "حرّر أشجار منخفضة"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr ""
@@ -28483,10 +28573,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "هوّة"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr ""
@@ -28494,5 +28584,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "حرّر أرض بور"
@@ -28500,5 +28590,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -28507,45 +28597,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "حرّر فناء مزرعة"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "مرج"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
@@ -28553,25 +28643,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "حديقة"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "عشب"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -28579,10 +28669,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "شائع"
@@ -28590,20 +28680,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "حرّر شائع"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "متنزه"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -28611,5 +28701,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "حرّر ميدان ألعاب"
@@ -28617,15 +28707,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -28633,9 +28723,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "حرّر مقبرة"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -28643,39 +28733,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "حرّر إستعمال الأرض كمقبرة"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -28683,15 +28773,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "حرّر أرض سكة حديد"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "عسكري"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "حرّر الإستخدام العسكري للأرض"
@@ -28699,50 +28789,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "موقع ورشة إعمار"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "حرّر موقع ورشة إعمار"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "حرّر كسّارة / مقلع حجارة"
@@ -28752,5 +28842,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "حرّر متعدد الضلوع"
@@ -28762,5 +28852,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "الفلق الخارجي"
@@ -28768,5 +28858,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -28774,5 +28864,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -28783,5 +28873,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -28789,36 +28879,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -28826,5 +28916,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -28833,5 +28923,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "حرّر حصر الإنعطاف"
@@ -28839,34 +28929,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -28875,15 +28965,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "مروراً بلعقدة أو الطريق"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "إلى الطريق"
@@ -28891,5 +28981,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "الطريق"
@@ -28898,5 +28988,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "حرّر طريق"
@@ -28904,5 +28994,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "نوع الطريق"
@@ -29010,5 +29100,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29019,17 +29109,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "حافلة (باص)"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "الطريق"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "عبارة بحرية"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29097,5 +29187,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29105,9 +29195,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "ترام"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr ""
@@ -29121,10 +29211,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -29132,31 +29222,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "الشبكة"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "المقترح"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "البديل"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "المؤقت"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "الإتصال"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -29165,30 +29255,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "الفلق الخلفي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "نقطة التوقف"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "نقطة التوقف الخلفية"
@@ -29415,5 +29505,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "مهجور"
@@ -30066,4 +30156,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30167,11 +30265,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "من صنع الإنسان"
@@ -30684,5 +30782,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "رصيف ميناء"
@@ -30696,5 +30794,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "خط أنابيب"
@@ -30838,13 +30936,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "وقت الفراغ"
@@ -30858,5 +30956,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "مارينا"
@@ -30952,10 +31050,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr ""
@@ -31057,10 +31155,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -31498,24 +31596,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -31547,6 +31645,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -31607,8 +31705,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "صحة"
@@ -31961,26 +32059,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "متجر/دكان"
@@ -32052,8 +32150,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "فندق"
@@ -32154,9 +32252,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "سياحة"
@@ -32244,9 +32342,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "تاريخي"
@@ -32259,5 +32357,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "كسارة / مقلع حجارة"
@@ -32271,5 +32369,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr ""
@@ -32291,5 +32389,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "حوض"
@@ -32303,5 +32401,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "فناء مزرعة"
@@ -32324,5 +32422,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "بيع بلمفرق"
@@ -32336,5 +32434,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "صناعي"
@@ -32348,5 +32446,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr ""
@@ -32360,5 +32458,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "حقل خضار"
@@ -32372,5 +32470,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr ""
@@ -32427,7 +32525,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "عسكري"
@@ -32441,5 +32539,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "مقبرة/جبانة"
@@ -32452,5 +32550,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "قمّة"
@@ -32465,5 +32563,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "نهر الجليد"
@@ -32477,5 +32575,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "بركان"
@@ -32530,8 +32628,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "طبيعي"
@@ -32545,5 +32643,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "أشجار منخفضة"
@@ -32557,5 +32655,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "أرض بور"
@@ -32569,5 +32667,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -32581,5 +32679,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "طين"
@@ -32593,5 +32691,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "شاطئ"
@@ -32669,8 +32767,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "طريق"
@@ -32759,12 +32857,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "الحدود"
@@ -32914,11 +33012,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "المكان"
@@ -32932,5 +33030,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33286,6 +33384,6 @@
 msgstr ""
 
-#~ msgid "closedway"
-#~ msgstr "طريق مغلقة الدوران"
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "درجات دقائق ثواني"
 
 #~ msgid "Unknown version"
@@ -33297,7 +33395,4 @@
 #~ msgid "Enter Password"
 #~ msgstr "أدخل كلمة المرور"
-
-#~ msgid "Do not show again"
-#~ msgstr "لا تظهر مرة اخرى"
 
 #~ msgid "Unknown role ''{0}''."
@@ -33417,4 +33512,7 @@
 #~ msgid "Uploading..."
 #~ msgstr "جاري الإرسال..."
+
+#~ msgid "closedway"
+#~ msgstr "طريق مغلقة الدوران"
 
 #~ msgid "Edit Properties"
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 22568)
+++ applications/editors/josm/i18n/po/bg.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-11 21:00+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 13:01+0000\n"
 "Last-Translator: bastik <Unknown>\n"
 "Language-Team: Bulgarian <bg@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-07-28 09:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -122,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -160,5 +159,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -231,5 +230,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -245,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -263,11 +262,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -275,20 +275,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -321,5 +321,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Обединение"
@@ -389,5 +389,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -401,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -421,4 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -435,6 +436,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -446,5 +447,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -579,22 +580,22 @@
 msgstr "Зареждане на отворени пакети с изменения"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Обедини линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Обединява няколко отделни линии в една."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Промени посоката?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Връщане и Комбиниране"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -604,5 +605,5 @@
 "посоката на някои от тях?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -612,10 +613,10 @@
 "последователност от възли)."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Обединяване {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Моля, изберете поне две линии за комбиниране."
@@ -660,10 +661,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -802,5 +803,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -867,10 +868,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Експорт до GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Експорт на данните до GPX файл."
@@ -1062,5 +1063,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1477,20 +1478,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1514,5 +1515,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1523,6 +1524,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Грешка"
@@ -1549,5 +1550,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1555,5 +1556,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Запазване на текущите данни."
@@ -1610,10 +1611,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Запазване като…"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Записване на текущите данни в нов файл."
@@ -1660,5 +1661,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1685,5 +1686,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Не, изход"
@@ -1752,18 +1753,24 @@
 msgstr[1] "Опростяване на път (премахнати {0} точки)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Разделяне на линия"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Разделяне на линията в избраната точка."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Текушата селекция не може да се използва за разделяне."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Избраните точки не се явяват част от един и същ път."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1771,5 +1778,5 @@
 msgstr[1] "Избраните точки не са в средата на път."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1785,16 +1792,6 @@
 "изберете и пътя."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Избраните точки не се явяват част от един и същ път."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Избраният път не съдържа избраната точка."
-msgstr[1] "Избраният път не съдържа избраните точки"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
@@ -1802,5 +1799,5 @@
 "път."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1810,5 +1807,5 @@
 "средата на пътя.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1818,5 +1815,5 @@
 "<br>Трябва да го проверите и коригирате ако е необходимо.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1826,5 +1823,5 @@
 "го проверите и коригирате ако е необходимо.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1975,5 +1972,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2960,22 +2957,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3121,25 +3118,25 @@
 "невъзможно е разрешаването на конфликт, за който няма предложено решение."
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#, java-format
+msgid "Delete node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#, java-format
+msgid "Delete way {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
-msgid "Delete node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
-#, java-format
-msgid "Delete way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
-#, java-format
 msgid "Delete relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3148,5 +3145,5 @@
 msgstr[1] "Изтриване на {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3155,5 +3152,5 @@
 msgstr[1] "Изтриване на {0} възела"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3162,5 +3159,5 @@
 msgstr[1] "Изтриване на {0} пътя"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3169,5 +3166,5 @@
 msgstr[1] "Изтриване на {0} отношения"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3322,5 +3319,5 @@
 msgstr "Прилагане?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3395,17 +3392,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Грешка при четене на файлове от директория {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Невъзможно да се вземе каноничното име на директория {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Грешка при създаване на кеш директория: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3585,42 +3582,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Градуси, минути, секунди"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "Ю"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "С"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "З"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "И"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3628,5 +3628,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3795,5 +3795,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "фон"
@@ -3939,5 +3939,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr ""
@@ -3965,5 +3965,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "железопътна линия"
@@ -3985,6 +3985,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4053,5 +4053,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "сграда"
@@ -4138,5 +4138,5 @@
 msgstr "Обектът е изтрит"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4237,69 +4237,69 @@
 msgstr "Парола"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "използване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Показване на тази помощ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Стандартен параметри на unix геометрия"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Сваляне на област в предала на рамка"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Сваляне на област по препратка (с параметри lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Сваляне на област от рамка, като GPS данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Избор с даденото търсене"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Стартиране в максимизиран режим"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Възстановяване на параметрите по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/път/към/папката/на/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4309,9 +4309,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "примери"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4319,46 +4319,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Инициализиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Зареждане на ранните разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Настройки по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Създаване на интерфейса"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Зареждане на разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Разрешаване"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4367,5 +4366,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4461,33 +4460,33 @@
 msgstr "Намаляване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "мащаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Географската дължина на показалеца на мишката."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Название на обекта сочен от показалеца на мишката."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Географска ширина на показалеца на мишката."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Ъгъл между предишния и текущия сегмент от пътя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Направлението на създавания линеен сегмент."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Дължина на новосъздавания линеен сегмент."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4495,9 +4494,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(няма обект)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4513,4 +4512,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Слоя ''{0}'' трябва да бъде в списъка от слоеве"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Помощна улица"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "китайска"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Търговия"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5222,5 +5236,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "всички"
@@ -5303,6 +5317,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5313,5 +5327,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5440,5 +5454,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr ""
@@ -5499,5 +5513,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5656,5 +5670,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5662,5 +5676,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5668,5 +5682,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5674,5 +5688,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5680,5 +5694,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5687,5 +5701,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5693,5 +5707,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5699,5 +5713,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5705,24 +5719,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "С"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5802,51 +5816,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Слоеве"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Отваряне списъка с всички заредени слоеве."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Превключване видимостта на избрания слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Показване/скриване"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Превключване видимостта на избрания слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Активиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Активиране на избрания слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Обедини този слой с друг слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Преместване избрания слой един ред нагоре."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Преместване избрания слой един ред надолу."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Информация за слоя"
@@ -5856,5 +5870,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Връзки"
@@ -7009,6 +7023,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7056,107 +7071,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Име"
@@ -7494,5 +7509,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7579,5 +7594,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<различни>"
@@ -8310,5 +8325,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8381,8 +8396,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Тип"
@@ -8411,6 +8426,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "неизвестно"
@@ -8739,5 +8754,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Забелязани са конфликти"
@@ -8801,14 +8816,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Опишете измененията на качваните от вас данни:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Невалиден коментар на заявката за качване"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9242,5 +9258,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Качване"
@@ -9262,5 +9278,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9268,60 +9284,93 @@
 msgstr "Настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Допълнителни настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Качване на промени"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Качване на променените примитиви"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Невалиден коментар на заявката за качване"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Нулиране"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Продължи"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Да не се показва повече"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Прекъсване на качването и продължаване с редактирането"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9652,103 +9701,11 @@
 msgstr[1] "{0} обекта за изтриване:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "GPS точка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Настройка рисуването на линии"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Използвай глобалните настройки."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Чертай линии между точките на този слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Не чертай линии между точките на този слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Избиране варианти за чертане на линиите."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Избор цвят"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "По подразбиране"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Изберете цвят"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Маркери от наименувани точки."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Наименувани точки от следа от {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Импорт Аудио"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave аудио файлове (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Аудио маркери от {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Импорт на изображения"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9756,5 +9713,5 @@
 msgstr "Название: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9762,5 +9719,5 @@
 msgstr "Описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9770,23 +9727,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Описание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Дължина: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9795,5 +9752,5 @@
 msgstr[1] "{0} маршрути, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9802,10 +9759,10 @@
 msgstr[1] "{0} точки на интерес"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Преобразувай в слой данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9815,21 +9772,21 @@
 "<br>Ако искате да качвате следи, погледнете тук:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Преобразувано от: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9837,10 +9794,10 @@
 msgstr "Свали от OSM по дължина на тази следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Свали всичко в пределите на:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9848,10 +9805,10 @@
 msgstr "{0} метри"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Максимална област за една заявка:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9859,21 +9816,21 @@
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9885,9 +9842,9 @@
 "Продължаване?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9897,5 +9854,5 @@
 "са пропуснати или преместени в началото."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9905,23 +9862,115 @@
 "смислено да се предположи тяхното време, бяха пропуснати."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Настройка рисуването на линии"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Използвай глобалните настройки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Чертай линии между точките на този слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Не чертай линии между точките на този слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Избиране варианти за чертане на линиите."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Избор цвят"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "По подразбиране"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Изберете цвят"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Маркери от наименувани точки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Наименувани точки от следа от {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Импорт Аудио"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave аудио файлове (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Аудио маркери от {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Импорт на изображения"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Слой Данни {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "извън областта за сваляне"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9930,11 +9979,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9943,36 +9992,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} се състои от:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "неустановена"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "API версия: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Преобразувай в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9980,5 +10029,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9987,5 +10036,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -9993,5 +10042,5 @@
 msgstr[1] "точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10000,5 +10049,5 @@
 msgstr[1] "следа с {0} точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10007,5 +10056,5 @@
 msgstr[1] "{0} се състои от {1} следи"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10014,24 +10063,28 @@
 msgstr[1] "{0} точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Корелиране към GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Файлове (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Файлът {0} е зареден вече под името \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Грешка при разбор {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Не може да се прочете \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10043,34 +10096,34 @@
 "изберете времева зона<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Време на снимката (от EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Gps време (прочетено от снимката по-горе): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [дд/мм/гггг чч:мм:сс]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Намирам се в часовата зона: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Без дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Отваряне друга снимка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Синхронизиране време от снимка на GPS приемник"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10080,93 +10133,93 @@
 "Моля използвайте изисквания формат!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Невалидна дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Няма още GPX следи заредени>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX следа: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Отвори друга GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Авто-отгатване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Часова зона: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Отместване:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Съпоставяне на изображения с GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Корелнутииране"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Невалидна часова зона"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Невалидно отместване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10176,20 +10229,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часови пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Минути: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунди: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10198,5 +10251,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10204,21 +10257,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Съотнасянето на снимки към следа се провали"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Настройване часови пояс и отместване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "Избраните снимки не съдържат времева информация."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Снимките не съдържат времева информация"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10226,17 +10279,17 @@
 msgstr "Избраната GPX следа не съдържа времена. Моля изберете друга."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX следата няма информация за времето"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Трябва да изберете GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Няма избрана GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10247,5 +10300,5 @@
 "Очакван формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10256,56 +10309,52 @@
 "Очакван формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Извличане на GPS координати от EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Започване на преглед на директории"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Прочитане на снимки..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Четене {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Невъзможно да се вземе каноничното име на директория {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Сканиране на директория {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Намерен е празен файл в директория {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Грешка при четене на файлове от директория {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Изображения с данни за местоположение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Корелиране към GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10314,5 +10363,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10321,10 +10370,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10333,5 +10382,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10431,9 +10480,9 @@
 msgstr "Изображения JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPS маркер"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10441,5 +10490,5 @@
 msgstr[1] "маркери"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10448,9 +10497,22 @@
 msgstr[1] "{0} се състои от {1} маркери"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"Няма съществуващи аудио маркери в този слой, спрямо които да се отмести."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Превключване видимостта на маркер текста и икони."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Синхронизиране аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10459,5 +10521,5 @@
 "синхронизиращ сигнал."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10465,14 +10527,14 @@
 msgstr "Аудио синхронизирано на точка {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Невъзможно да се синхронизира в слоя, който се изпълнява."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Установи аудио маркер на позицията на прослушване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10481,17 +10543,4 @@
 "Трябва да сте поставили аудио пауза в точката от следата, където искате "
 "маркера."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"Няма съществуващи аудио маркери в този слой, спрямо които да се отмести."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Превключване видимостта на маркер текста и икони."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11352,4 +11401,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Никога"
@@ -11364,5 +11414,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11466,5 +11516,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11473,5 +11523,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Само в началото на път."
@@ -11501,5 +11551,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Автор"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Дизел"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Лодка"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11509,9 +11574,9 @@
 "отваряне на GPX слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Свързване с линии на GPS точките"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11521,9 +11586,9 @@
 "Задайте ''-1'' за чертаене на всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Максимална дължина за локални файлове (метри)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11532,20 +11597,20 @@
 "се рисуват всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Максимална дължина (в метри)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Изобразвай линии, даже ако не е импортирана информация за линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Изобразвай стрелки по посоката на линиите, съединяващи GPS точки."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11554,5 +11619,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11561,13 +11626,13 @@
 "Не рисувай стрелки, ако те се не са поне на това разстояние една от друга."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Минимално разстояние (в пиксели)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Рисуване на по-големи GPS точките."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11577,9 +11642,9 @@
 "в мениджър слоеве."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Оцветяване точките от следите според скоростта."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11587,5 +11652,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -11593,33 +11658,42 @@
 "скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Оцветяване на следата"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "WayPoint изображение"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS Точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Показване на направлението на сегментите на пътя."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показване поредните номера на всички сегменти на пътя."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Приложи изглаждане върху картата."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Изобразяване границата на свалената от сървъра област."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11628,9 +11702,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Изобразяване неактивните слоеве с данни в други цветове."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM Данни"
@@ -11987,21 +12061,26 @@
 "Трябва да рестартирате JOSM, за да може изменените настройки да подействат."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Метод на проекция"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Показвай координатите като"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Метод на проекция"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Слой за провеждане на измервания"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Картографска проекция"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12545,5 +12624,5 @@
 msgstr "Добавяне на нов етикет"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12552,49 +12631,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Повече информация за тази възможност"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Незадължителни Атрибути:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестен тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12604,15 +12683,15 @@
 msgstr "Не може да се прочете източник на шаблони за маркиране: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Грешка при разбор {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Елементи от тип {0} се поддържат."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12622,17 +12701,17 @@
 msgstr[1] "Промяна {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Нищо не е избрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Селекцията е неподходяща!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Прилагане шаблон"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12650,7 +12729,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Търси: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12659,17 +12737,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Търсене на обекти."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Мащабиране по селекцията"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Търси: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12968,5 +13043,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Грешка при разбор: невалидна структура на gpx документа"
@@ -14414,5 +14489,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14685,5 +14760,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Интерполация на адреси"
@@ -15025,41 +15100,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15076,25 +15151,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15132,18 +15207,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Сгради"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15304,7 +15379,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
-#, fuzzy
 msgid "Use \"Tableau d''assemblage\""
-msgstr "Избор на Tableau d'Assemblage"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -15368,8 +15442,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "вода"
@@ -15430,6 +15504,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "адрес"
@@ -15914,34 +15988,34 @@
 "един от тях първо, после опитайте отново."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Празен слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS слой ({0}), {1} квадрант(и) зареден(и)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Не е векоторизиран."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Размер на растера: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "Векторизиран."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Комуна bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15952,14 +16026,14 @@
 "Моля, създайте нов кеш."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Грешка на кеш формата"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr "Грешка в кеширането на Ламбертовата зона"
@@ -16038,22 +16112,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Сваляне на обект..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Свали от OSM по дължина на тази следа"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Сваляне на добавка"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Моля изберете поне един тип данни за сваляне."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16068,7 +16138,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Грешка при разбор {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16099,9 +16169,9 @@
 msgstr "Създаване на копие на път"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Слой за редактиране на GPX следи"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Преобразуване към GPX слой с анонимно време"
@@ -16111,5 +16181,5 @@
 msgstr "Редактиране GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "редактиране gpx следи"
@@ -16118,11 +16188,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Импортиране на път от GPX слой"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Височина на съществуващ път"
@@ -16132,5 +16202,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Не е открит слой с GPX данни."
@@ -16140,13 +16210,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16388,5 +16458,5 @@
 msgstr "Показване на не-геомаркирани фотографии"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Импортирани изображения"
@@ -16749,8 +16819,6 @@
 msgstr "Отваряне на прозореца за измервания."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Нулиране"
@@ -16782,5 +16850,5 @@
 msgstr "Ъгъл между две избрани точки"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Слой за провеждане на измервания"
@@ -16872,5 +16940,5 @@
 msgstr "Цикъл на сваляне от OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Показване на проблеми от OpenStreetBugs"
@@ -16940,13 +17008,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17062,93 +17130,93 @@
 msgstr "изпълним файл на Firefox"
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -17190,9 +17258,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17370,21 +17438,26 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "оправена версия:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "ръчно потвърждаване на всички действия на дистанционното управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 "Разширение, което позволява JOSM да бъде управляван от други приложения."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Дистанционно"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Настройки на разширението за дистанционно управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17396,35 +17469,37 @@
 "за да се свързват с него."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Позволени действия"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 "Дистанционното управление получи заявка за зареждане на данни от API-то."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Подробности на заявката: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Желаете ли да разрешите това?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Потвърждение на действието на дистанционното управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -17432,17 +17507,23 @@
 "URL:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17450,5 +17531,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Възстановяване"
@@ -17647,41 +17728,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Интерактивна карта"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Зареждане на квадрант"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Зареждане на всички квадранти"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Увеличаване на мащаба"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Намаляне на мащаба"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Изчистване на кеша"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "изображение "
@@ -17986,4 +18067,14 @@
 msgid "Terrace"
 msgstr "Разделяне на сграда"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Разделител"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18670,6 +18761,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18679,9 +18770,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18760,6 +18851,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18767,5 +18858,5 @@
 msgstr "Грешки при проверка"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Няма грешки при проверката"
@@ -19008,32 +19099,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Повтарящи се точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Повтарящи се точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Повтарящи се точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Повтарящи се точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Повтарящи се точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Повтарящи се точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19070,5 +19155,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Мултиполигон"
@@ -19599,5 +19684,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "област"
@@ -19735,10 +19820,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19884,10 +19969,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20075,28 +20160,24 @@
 "Това може да доведе до погрешни координати."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Автоматично сваляне"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS слой ({0}), автоматично сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS слой ({0}), сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20111,17 +20192,17 @@
 "WMS въпреки всичко?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Да, дръпни изображенията"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "Невалиден URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Сваляне на видимите квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20130,48 +20211,52 @@
 "разделителната способност."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Смяна разделителна способност"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Презареждане грешни квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Алфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Запис на WMS слоя във файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Запис на слоя WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Зареждане на WMS слой от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Четене на WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Грешка във формата на файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Грешка при зареждане на файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Автоматично сваляне"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20250,5 +20335,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20285,5 +20370,5 @@
 msgstr "Аудио устройството е недостъпно"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20304,5 +20389,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "залесена площ"
@@ -20321,71 +20406,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "граница"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "сегмент напред"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "линия"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Мултиполигон"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Мрежа"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "карта на обществен транспорт"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Ограничения"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "маршрут"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "място"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "водоеми"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20666,7 +20741,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Свали от OSM по дължина на тази следа"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20885,6 +20959,11 @@
 msgstr "Създава терасовидни къщи от един блок."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20893,5 +20972,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20900,5 +20979,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20907,10 +20986,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20922,5 +21001,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20930,5 +21009,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20937,15 +21016,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20954,5 +21033,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21085,5 +21164,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Означение"
@@ -21622,5 +21701,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "метал"
@@ -21633,5 +21712,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr ""
@@ -21935,9 +22014,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "да"
@@ -22047,9 +22126,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "не"
@@ -22308,5 +22387,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "улица"
@@ -22355,5 +22434,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "служебна"
@@ -22388,5 +22467,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "ремонт"
@@ -22473,5 +22552,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "туристически маршрут"
@@ -22506,5 +22585,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "за средно ниво"
@@ -22674,14 +22753,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Оператор"
@@ -22949,6 +23028,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Надморска височина"
@@ -23396,5 +23475,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "блато"
@@ -23800,5 +23879,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Волтаж"
@@ -24162,31 +24241,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Работно време"
@@ -24246,90 +24325,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "денонощно"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "понеделник-петък 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "вторник-неделя 08:00-15:00; събота 08:00-12:00"
@@ -24442,7 +24521,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Ref номер"
@@ -24458,5 +24537,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "подземен"
@@ -24469,6 +24548,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Такса"
@@ -24644,5 +24723,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Инвалидна количка"
@@ -24679,6 +24758,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Навес"
@@ -24686,5 +24765,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Скамейка"
@@ -24803,5 +24882,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Маяк / Радиопредавател"
@@ -24962,5 +25041,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Кухня"
@@ -24968,73 +25047,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "италианска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "китайска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "пица"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "бургери"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "гръцка"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "немска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "индийска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "местна"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "турска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "азиатска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "тайландска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "мексиканска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "японска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Заведение за бързо хранене"
@@ -25042,17 +25126,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Редактирай заведение бързо хранене"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Кафене"
@@ -25060,9 +25144,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Редактирай кафене"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Бар"
@@ -25070,18 +25154,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Редактирай бар"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Бирария"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Редактирай бирария"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Бар"
@@ -25089,9 +25174,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Редактиране на бар"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Нощен клуб"
@@ -25099,24 +25184,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Редактирай нощен клуб"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Туризъм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Атракция"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Редактирай забележилтеност"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Музей"
@@ -25124,9 +25209,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Редактирай музей"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -25135,9 +25220,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Редактирай зоопарк"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Място с добра гледка"
@@ -25145,24 +25230,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Редактирай място с добра гледка"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Наблюдателница"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Развлекателен парк"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Редактирай развлекателен парк"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Творба на изкуството"
@@ -25170,5 +25255,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Редактирай творба на изкуството"
@@ -25176,19 +25261,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Информационен пункт"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -25226,5 +25311,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25232,28 +25317,28 @@
 msgstr "улица"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "схема"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "място"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "град"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "район"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "По-подробно описание"
@@ -25263,5 +25348,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Показани са пътища за:"
@@ -25269,5 +25354,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Туристическа пътека"
@@ -25275,6 +25360,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Велосипедизъм"
@@ -25282,5 +25367,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Планинско колоездене"
@@ -25288,6 +25373,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Ски"
@@ -25295,5 +25380,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Колоездене"
@@ -25301,46 +25386,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "... възможни са други способи за придвижване"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Информационно табло"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Съдържание на таблото"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "табела"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "дива природа"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Упътване"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Информационен пункт"
@@ -25348,29 +25440,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "По-точно описание"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Аудио напътствия"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Аудио-напътствия по мобилен телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Тел. номер"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Други информационни точки"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Редактирай навес"
@@ -25378,25 +25470,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Огнище"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Място за пикник"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Редактирай място за излет"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Исторически места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Замък"
@@ -25405,19 +25497,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Редактирай замък"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Руини"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Редактирай руини"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Архиологични разкопки"
@@ -25426,9 +25518,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Редактирай архиологични разкопки"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Поле на битка"
@@ -25436,10 +25528,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Редактирай поле на битка"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25447,5 +25539,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25453,15 +25545,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Забележителност"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Редактирай забележителност"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Паметник"
@@ -25469,55 +25561,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Редактирай паметник"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Редактирай крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Редактирай крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Пограничен камък"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "редактиране на: Пограничен камък"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Места за отдих и развлечения"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Редактирай аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Площадка"
@@ -25525,35 +25617,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Редактирай площадка"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Риболов"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Редактирай риболов"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Спортни съоражения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Редактирай стадион"
@@ -25567,6 +25659,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "вид спорт:"
@@ -25982,31 +26074,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "спорт"
@@ -26016,240 +26108,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "многобой"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "стрелба с лък"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "австралийски футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "игра с мет.топчета"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "игра с асим.топки"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "кану"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "алпинизъм"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "крикет мрежи"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "кучешки надбягвания"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "конна езда"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "голф"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "конни надбягвания"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "моторен спорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "ракет бол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "стрелба"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "фигурно пързаляне"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "ски"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "плуване"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "тенис на маса"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "тенис"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Спортен център"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Редактирай спортен център"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Игрище"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Редактирай игрище"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Състезателна писта"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Редактирай състезателна писта"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Поле за голф"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Редактирай поле за голф"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Миниголф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Редактирай миниголф"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Многобой"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Редактирай многобой"
@@ -26291,23 +26383,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "тип"
@@ -26349,211 +26441,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "игрище"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "спортен център"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "следа"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Боулинг зала"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Редактирай боулинг зала"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Редактирай атлетика"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Стрелба с лък"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Редактирай стрелба с лък"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Скално катерене"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Редактирай скално катерене"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Кану"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Редактирай кану"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Редактирай велосипедизъм"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Надпреварване с кучета"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Редактирай надбягвания с кучета"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Конна езда"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Редактирай конна езда"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Конни надбягвания"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Редактирай конни надбягвания"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Редактирай гимнастика"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Моторни спортове"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Редактирай моторни спортове"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Фигурно пързаляне"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Редактирай фигурно пързаляне"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Редактирай скейтборд"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Плуване"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Редактирай плуване"
@@ -26561,52 +26653,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Редактирай ски"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Тип писта"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "спускане"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "нордическа"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "Зимен парк"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Трудност"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "начинаещ"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "лесно"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "за напреднали"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "експерт"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "свободна езда"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Стрелба"
@@ -26614,204 +26706,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Редактирай стрелба"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Спорт (с топка)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Редактирай футбол"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Австралийски футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Редактирай австралийски футбол"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Редактирай бейсбол"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Редактирай баскетбол"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Голф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Редактирай голф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "поле за голф"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Буле (игра с мет.топчета)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Редактирай Игра с мет.топчета"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Игра с асим.мет.топки (bowls)"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Редактирай игра с асим.мет.топки"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Редактирай крикет"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Крикет мрежи"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Рекдатирай крикет мрежи"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Редактирай крокет"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Редактирай хокей"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Редактирай пелота"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "ракет"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Редактирай ракет"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Тенис на маса"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Редактирай тенис на маса"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Тенис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Редактирай тенис"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Изкуствени"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Сграда"
@@ -26819,5 +26911,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Обществена сграда"
@@ -26825,10 +26917,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Редактирай обществена сграда"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Кметство"
@@ -26836,10 +26928,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Редактирай кметство"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Посолство"
@@ -26847,10 +26939,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Редактирай посолство"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Съдебна сграда"
@@ -26859,10 +26951,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Редактирай съдебна сграда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Затвор"
@@ -26871,10 +26963,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Редактирай затвор"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -26884,10 +26976,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Редактирай полиция/милиция"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Пожарна"
@@ -26896,10 +26988,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Редактирай пожарна"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Пощенска станция"
@@ -26907,5 +26999,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Редактирай пощенска станция"
@@ -26913,15 +27005,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Редактирай детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Училище"
@@ -26929,10 +27021,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Редактирай училището"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Университет"
@@ -26940,10 +27032,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Редактирай университет"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Колеж"
@@ -26951,5 +27043,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Редактирай колеж"
@@ -26957,5 +27049,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Кино"
@@ -26964,10 +27056,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Редактирай кино"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Библиотека"
@@ -26976,9 +27068,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Редактирай библиотека"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Център на изкуствата"
@@ -26986,10 +27078,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Редактирай център на изкуствата"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Театър"
@@ -26998,10 +27090,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Редактирай театър"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Място за богослужение"
@@ -27011,5 +27103,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Редактирай място за богослужение"
@@ -27018,6 +27110,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Религия"
@@ -27026,66 +27118,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "Будизъм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "Християнство"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "Индуизъм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "Джайнизъм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "Юдаизъм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "Мусулманство"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "Сикхизъм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "Спиритуализъм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "Даосизъм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "Унитаристи"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "Зороастризъм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Конфесия"
@@ -27094,81 +27186,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "Англиканска"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "Баптизъм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "Католическо"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "Евангелска"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "Свидетели на Йехова"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "Методизъм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "Мормони"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "Петдесетници"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "Пресвитериани"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "Протестантизъм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "Кваркери"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "Шийти"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "Сунити"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Адреси"
@@ -27177,5 +27269,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Редактиране на информацията за адреса"
@@ -27183,5 +27275,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Номер"
@@ -27189,25 +27281,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Име на дом"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Име на улица"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Име на град"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Пощенски код"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Код на държава"
@@ -27216,5 +27308,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Редактирай интерполация на адреси"
@@ -27222,61 +27314,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Схема на номериране"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "нечетни"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "четни"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "по азбучен ред"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Изкуствени"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Цех"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Редактирай цех"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Кула"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Редактирай кула"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Тип на кулата"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Височина (в метри)"
@@ -27284,25 +27376,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Водонапорна кула"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Редактирай водонапорна кула"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Газохранилище"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Редактирай газохранилище"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
@@ -27310,10 +27402,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Редактирай маяк / светлинен фар"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Мелница"
@@ -27321,10 +27413,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Редактирай мелница"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Тръбопровод"
@@ -27333,41 +27425,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Редактирай газопровод"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "нефт"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "отходна тръба"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Местоположение"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "подводно"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Пречиствателна станция"
@@ -27377,10 +27469,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Редактирай пречиствателна станция"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Кран"
@@ -27388,5 +27480,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Редактирай кран"
@@ -27394,10 +27486,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Редактирай маяк / радиопредавател"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Точка на наблюдение"
@@ -27405,10 +27497,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Редактирай точка на наблюдение"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -27416,23 +27508,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Редактирай видеонаблюдение"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Електроцентрала"
@@ -27442,35 +27534,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Редактирай електрогенератор"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "вятърна енергия"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "водна енергия"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "енергия от изкопаеми горива"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "въглища"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "слънчева енергия"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Електростанция"
@@ -27479,10 +27571,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Редактирай електростанция"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Електроподстанция"
@@ -27491,5 +27583,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Редактирай електроподстанция"
@@ -27497,10 +27589,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Номер линия"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Електрически стълб от ЕПМ"
@@ -27511,23 +27603,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Редактирай стълб от ЕПМ"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "кула"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Линия за електропренос"
@@ -27536,78 +27628,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Редактирай линия за електропренос"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Тип на линия"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "линия"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "второстепенна линия"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Брой проводници"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Брой на жилата на всеки кабел"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "един"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "два"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "три"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "четири"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Обществени удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Тоалетни"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Забележка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Пощенска кутия"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Телефон"
@@ -27616,5 +27706,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Редактирай телефон"
@@ -27622,5 +27712,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Монети"
@@ -27628,5 +27718,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Банкноти"
@@ -27634,5 +27724,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Електрони средства за разплата"
@@ -27640,5 +27730,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Дебитни карти"
@@ -27646,15 +27736,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Кредитни карти"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Телефонни карти"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Рециклиране"
@@ -27663,5 +27753,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Редактиране на станция за рециклиране"
@@ -27669,35 +27759,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Батерии"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Консервни кутии"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Дрехи"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Стъкло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Хартия"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Вторични суровини"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27705,5 +27795,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27712,31 +27802,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "камък"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "пластмаса"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Цвят"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "черно"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "кафяво"
@@ -27815,39 +27905,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "зеленина"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "червено"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "синьо"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "сиво"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "бяло"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Брой седящи места"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Ловно скривалище"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Редактирай ловно скривалище"
@@ -27856,30 +27946,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Височина"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "нисък"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "среден"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "пълен"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Скривалище"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Заключване"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Фонтан"
@@ -27888,10 +27978,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Редактирай фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Питейна вода"
@@ -27900,10 +27990,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Редактирай питейна вода"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Пожарен кран"
@@ -27912,5 +28002,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "редактиране на \"Пожарен кран\""
@@ -27918,5 +28008,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Дестка ясла"
@@ -27924,15 +28014,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Редактирай детска ясла"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Автомобили"
@@ -27940,10 +28030,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Редактирай автосалон"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Велосипеди"
@@ -27952,28 +28042,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Редактирай вело-магазин"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Редактирай супермаркет"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Аптека"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Редактиране на: аптека"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Хранителни стоки"
@@ -27981,9 +28071,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Редактиране на \"магазин за хранителни стоки\""
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Будка"
@@ -27991,27 +28081,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Редактирай будка"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Книжарница"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Редактиране на книжарница"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Туристическа агенция"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Редактиране на туристическа агенция"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Месарница"
@@ -28019,9 +28109,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Редактирай месарница"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Фурна"
@@ -28029,9 +28119,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Редактирай фурна"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Цветарски магазин"
@@ -28039,18 +28129,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Редактирай цветарски магазин"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Био магазин"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Редактирай био магазин"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Алкохол"
@@ -28058,54 +28148,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Редактиране магазин за алкохол"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Редактиране магазин за безалкохолни"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Компютри"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Редактирай компютърен магазин"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Електроника"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Редактирай магазин за електроника"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Аудио HiFi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Редактирай магазин за Аудио HiFi"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Мебелен магазин"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Редактирай мебелен магазин"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Градински център"
@@ -28113,9 +28203,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Редактирай градински център"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Железария"
@@ -28123,9 +28213,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Редактирай железария"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Магазин \"Направи си сам\""
@@ -28133,54 +28223,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Редактирай магазин \"Направи си сам\""
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Книжарница"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Редактирай книжарница"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Фризьорски салон / козметика"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Редактирай фризьорски салон / козметика"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Обувки"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Редактирай магазин за обувки"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Играчки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Редактирай магазин за играчки"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Видео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Редактирай Видео-магазин"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Химическо чистене"
@@ -28188,9 +28278,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Редактирай химическо чистене"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Пералня"
@@ -28198,9 +28288,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Редактирай пералня"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Туристически стоки (за активен отдих)"
@@ -28208,24 +28298,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Редактирай мазизин за туристически стоки"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Редактирай магазин за спортни стоки"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Оптика"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Редактирай оптика"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Автомат за стоки"
@@ -28233,5 +28323,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Редактирай автомат за стоки"
@@ -28239,97 +28329,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Продукти за автоматична продажба"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "билети за обществен транспорт"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "карта на обществен транспорт"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "билети за паркиране"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "храна"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "сладки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "цигари"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "храна за животни"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "вестници"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "играчки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "пощенски марки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "телефонни ваучери"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "торби за екскременти"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "клиентски карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Пари"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Банка"
@@ -28337,14 +28427,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Редактирай банка"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Обмяна на валута"
@@ -28352,5 +28442,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Редактирай обмяна на валута"
@@ -28358,15 +28448,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Редактирай банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Здраве"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Лекар"
@@ -28374,18 +28464,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "редактиране на \"Лекар\""
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Редактирай стоматолигия"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -28393,5 +28483,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Редактирай аптека"
@@ -28399,9 +28489,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Приготвят лекарства по рецепти"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Болница"
@@ -28409,10 +28499,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Редактирай болница"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Пункт за връзка със спешна помощ"
@@ -28421,5 +28511,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Редактирай пункт за връзка със спешна помощ"
@@ -28428,20 +28518,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Номер на пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Име на пункта"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Телефонен номер"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Използвайте международен код, като например +12-345-67890)"
@@ -28449,5 +28539,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -28456,64 +28546,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Редактирай ветеринар"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "География"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Места"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Редактирай континент"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Държава"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Редактирай държава"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Област/Щат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Редактирай област/щат"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Област"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Редактирай област"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Графство"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Редактирай графство"
@@ -28521,15 +28611,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Град (над 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Редактирай голям град"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Град (под 100 000)"
@@ -28537,10 +28627,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Редактирай град"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Квартал/предградие"
@@ -28548,25 +28638,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Редактирай квартал"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Редактирай село"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Махала"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Редактирай махала"
@@ -28574,5 +28664,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Местност"
@@ -28580,10 +28670,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Редактирай местност"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Остров"
@@ -28591,10 +28681,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Редактирай остров"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Скала"
@@ -28602,5 +28692,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Редактиране на: скала"
@@ -28608,5 +28698,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Пещерен вход"
@@ -28614,10 +28704,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Редактиране пещерен вход"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Връх"
@@ -28625,10 +28715,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Редактиране връх"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Ледник"
@@ -28636,10 +28726,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Редактиране ледник"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Вулкан"
@@ -28647,70 +28737,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Редактиране вулкан"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Граници"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Национална"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Редактирай национална граница"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Административна"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Редактирай административна граница"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Гражданска"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Редактирай гражданска граница"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Политическа"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Редактирай политическа граница"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Национален парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Редактирай граница национален парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Земеползване"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Дърво"
@@ -28719,15 +28809,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Редактирай дърво"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Ботаническо название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Гора"
@@ -28736,5 +28826,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "редактиране на \"гора\""
@@ -28742,17 +28832,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "иглолистен"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "широколистен"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "смесен"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Гора"
@@ -28761,14 +28851,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "редактиране на \"залесена площ\""
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Природен резерват"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Редактирай природен резерват"
@@ -28776,25 +28866,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Сипей"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Редактирай сипей"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Шубрак"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Редактирай шубрака"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Скалист склон"
@@ -28802,10 +28892,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Редактирай скалист склон"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Пустош"
@@ -28813,5 +28903,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Редактиране пустош"
@@ -28819,5 +28909,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Двор ферма"
@@ -28826,45 +28916,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Редактирай двор ферма"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Обработваема земя"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Редактирай обработваема земя"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Поляна"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Редактиране поляна"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Лозе"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Редактирай лозе"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Земя за лично ползване"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Редактиране на: Земя за лично ползване"
@@ -28872,25 +28962,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Градина"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Редактирай градина"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Трева"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Редактирай трева"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Зелено село"
@@ -28898,10 +28988,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Редактирай зелено селище"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Общи"
@@ -28909,20 +28999,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Редактирай общи"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Редактирай парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Спортна площадка"
@@ -28930,5 +29020,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Редактирай спортна площадка"
@@ -28936,15 +29026,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Жилищна зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Редактирай жилищна зона"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Църковно гробище"
@@ -28952,9 +29042,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Редактирай църковно гробище"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Гробище"
@@ -28962,39 +29052,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Редактирай гробище"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Търговия на дребно"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Редактирай търговия на дребно"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Търговия"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Редактирай търговия"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Промишленост"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Редактирай промишленост"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Железопътен път"
@@ -29002,15 +29092,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Редактирай ЖП"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Военен"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Редакирай военна земя"
@@ -29018,50 +29108,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Строителна площадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Редактирай строителна площадка"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Индустриални развалини"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Редактирай ундустриални развалини"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Зелени площи"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Редактирай зелени площи"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Сметище"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Редактирай сметище"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Кариера"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Редактирай кариера"
@@ -29071,5 +29161,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Редактиране мултиполигон"
@@ -29081,5 +29171,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "външен сегмент"
@@ -29087,5 +29177,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "вътрешен сегмент"
@@ -29093,5 +29183,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -29102,5 +29192,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -29108,36 +29198,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29145,5 +29235,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Ограничения при завиване"
@@ -29152,5 +29242,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Редактиране на ограничения при завиване"
@@ -29158,34 +29248,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Ограничения"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "забранен ляв завой"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "забранен десен завой"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "забранено напред"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "забранен обратен завой"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "само десен завой"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "само ляв завой"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "само направо"
@@ -29194,15 +29284,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "от път"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "през точка или път"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "до път"
@@ -29210,5 +29300,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Маршрут"
@@ -29217,5 +29307,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Редактиране маршрут"
@@ -29223,5 +29313,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Тип маршрут"
@@ -29329,5 +29419,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29338,17 +29428,17 @@
 msgstr "велосипед"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "автобус"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "път"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "ферибот"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "ски"
@@ -29416,5 +29506,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29424,9 +29514,9 @@
 msgstr "пеш"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "трамваен маршрут"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "обиколка"
@@ -29440,10 +29530,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Описание на символ"
@@ -29451,31 +29541,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Мрежа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Състояние на пътя"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "предложен"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "алтернативен"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "временен"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "връзка"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Цвят (hex)"
@@ -29484,30 +29574,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "сегмент от маршрут"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "сегмент напред"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "точка за спиране"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "точка за спиране напред"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "точка за спиране назад"
@@ -29734,5 +29824,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "остарял, вече невалиден"
@@ -30385,4 +30475,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30486,11 +30584,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "изкуствени съоръжения"
@@ -31003,5 +31101,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "кей"
@@ -31015,5 +31113,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "тръбопровод"
@@ -31157,13 +31255,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "отдих и развлечение"
@@ -31177,5 +31275,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "яхт пристан"
@@ -31271,10 +31369,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "Обществени услуги"
@@ -31376,10 +31474,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "Обществен трафик"
@@ -31817,24 +31915,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "Обществено осветление"
@@ -31866,6 +31964,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "светла_вода"
@@ -31926,8 +32024,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "здравеопазване"
@@ -32280,26 +32378,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "магазин"
@@ -32371,8 +32469,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "хотел"
@@ -32473,9 +32571,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "туризъм"
@@ -32563,9 +32661,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "исторически"
@@ -32578,5 +32676,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "кариера"
@@ -32590,5 +32688,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "сметище"
@@ -32610,5 +32708,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "басейн"
@@ -32622,5 +32720,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "двор ферма"
@@ -32643,5 +32741,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "търговия на дребно"
@@ -32655,5 +32753,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "индустрия"
@@ -32667,5 +32765,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "индустриални развалини"
@@ -32679,5 +32777,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "зелена площ"
@@ -32691,5 +32789,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "ЖП"
@@ -32746,7 +32844,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "военни"
@@ -32760,5 +32858,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "гробище"
@@ -32771,5 +32869,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "връх"
@@ -32784,5 +32882,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "ледник"
@@ -32796,5 +32894,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "вулкан"
@@ -32849,8 +32947,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "природа"
@@ -32864,5 +32962,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "храсталак"
@@ -32876,5 +32974,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "пустош"
@@ -32888,5 +32986,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "гориста местност"
@@ -32900,5 +32998,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "кал"
@@ -32912,5 +33010,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "плаж"
@@ -32988,8 +33086,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "маршрут"
@@ -33078,12 +33176,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "граница"
@@ -33233,11 +33331,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "място"
@@ -33251,5 +33349,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33605,6 +33703,11 @@
 msgstr "Сицилия - Италия"
 
-#~ msgid "closedway"
-#~ msgstr "затворен път"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Избраният път не съдържа избраната точка."
+#~ msgstr[1] "Избраният път не съдържа избраните точки"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Градуси, минути, секунди"
 
 #~ msgid ""
@@ -33700,7 +33803,4 @@
 #~ msgstr "Съвет: Някои промени са дошли при качването на данните към сървъра."
 
-#~ msgid "Do not show again"
-#~ msgstr "Да не се показва повече"
-
 #~ msgid "different"
 #~ msgstr "различно"
@@ -33837,7 +33937,4 @@
 #~ msgstr "тяхна версия:"
 
-#~ msgid "resolved version:"
-#~ msgstr "оправена версия:"
-
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33928,7 +34025,4 @@
 #~ msgid "Bridleway"
 #~ msgstr "Алея за езда"
-
-#~ msgid "Boat"
-#~ msgstr "Лодка"
 
 #~ msgid "Motorboat"
@@ -34493,4 +34587,7 @@
 #~ msgstr "Проверка за бележки при рисуване."
 
+#~ msgid "closedway"
+#~ msgstr "затворен път"
+
 #~ msgid "Footway"
 #~ msgstr "Алея / Тротоар"
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 22568)
+++ applications/editors/josm/i18n/po/cs.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-26 07:36+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 13:42+0000\n"
 "Last-Translator: hanoj <ehanoj@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\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-07-28 09:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -232,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -246,5 +245,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -264,11 +263,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -276,20 +276,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -322,5 +322,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Sloučit"
@@ -390,5 +390,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -402,5 +402,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -422,4 +422,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -436,6 +437,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -447,5 +448,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -580,22 +581,22 @@
 msgstr "Stahování otevřených sad změn..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Spojit cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Spojit více cest do jedné"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Změnit směr ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Otočit a zkombinovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -605,5 +606,5 @@
 "orientaci?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -611,10 +612,10 @@
 msgstr "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Kombinovat {0} cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Prosím zvolte minimálně dvě cesty ke spojení"
@@ -660,10 +661,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -801,5 +802,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -865,10 +866,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Exportovat do GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Exportovat data do GPX souboru."
@@ -1061,5 +1062,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1481,20 +1482,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1518,5 +1519,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1527,6 +1528,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Chyba"
@@ -1553,5 +1554,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1559,5 +1560,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Uložit aktuální data."
@@ -1614,10 +1615,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Uložit jako..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Uložit aktuální data do nového souboru"
@@ -1664,5 +1665,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1689,5 +1690,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Ne, zrušit"
@@ -1759,18 +1760,24 @@
 msgstr[2] "Zjednodušení cesty (odstranění {0} uzlů)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Rozdělit cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Rozdělit cestu zvoleným uzlem"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Tento výběr nemůže být použit k rozdělení."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Zvolené uzly nesdílejí stejnou cestu."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1779,5 +1786,5 @@
 msgstr[2] "Zvolené uzly nejsou uprostřed žádné cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1790,21 +1797,10 @@
 msgstr[2] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Zvolené uzly nesdílejí stejnou cestu."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Označená cesta neobsahuje vybraný uzel."
-msgstr[1] "Označené cesty neobsahují vybraný uzel."
-msgstr[2] "Označené cesty neobsahují vybrané uzly."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1814,5 +1810,5 @@
 "cesty.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1823,5 +1819,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1831,5 +1827,5 @@
 "být ověřeno, zda je zkopírování správné a případně opraveno.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1982,5 +1978,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2982,22 +2978,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3141,25 +3137,25 @@
 msgstr "nemohu vyřešit nerozhodnutý konflikt"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr "Pro mazání je třeba vybrat alespoň jeden objekt, nemáte nic vybráno"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Smazat bod {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Smazat cestu {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Smazat relaci {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3169,5 +3165,5 @@
 msgstr[2] "Smazat {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3177,5 +3173,5 @@
 msgstr[2] "Smazat {0} uzlů"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3185,5 +3181,5 @@
 msgstr[2] "Smazat {0} cest"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3193,5 +3189,5 @@
 msgstr[2] "Smazat {0} relací"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3350,5 +3346,5 @@
 msgstr "Použít ?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3423,17 +3419,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Chyba při získávání souborů z adresáře {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Přepsat staré záložní soubory?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Chyba při vytváření cache adresáře: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3608,42 +3604,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Stupně minuty sekundy"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "J"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "S"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "Z"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3651,5 +3650,5 @@
 msgstr "Prvek {0} nelze přidat do datové sady, jelikož v ní již je"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3821,5 +3820,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "pozadí"
@@ -3963,5 +3962,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Neptat se příště (zapamatovat si volbu)"
@@ -3989,5 +3988,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "železnice"
@@ -4009,6 +4008,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4078,5 +4077,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "budova"
@@ -4164,5 +4163,5 @@
 msgstr "Objekt smazán"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4263,69 +4262,69 @@
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "použití"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Zobrazí tuto nápovědu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standardní unixová geometrie okna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Stáhnout ohraničující box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stáhnout umístění s url (obsahující lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Stáhnout ohraničenou oblast jako \"raw\" GPS data"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Spustit přes celou obrazovku"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Nastavit výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Nastavit jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/ADRESARI/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Změnit adresář pro všechna uživatelská nastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4335,9 +4334,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "příklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4347,46 +4346,45 @@
 "pořadí."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inicializace"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Aktualizuji pluginy..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Instaluji aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Načítám dřívější pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Nastavuji výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Vytváří se grafické rozhraní programu (GUI)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Načítám pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Vyřešit"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4395,5 +4393,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4489,33 +4487,33 @@
 msgstr "Oddálit"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "měřítko"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Zeměpisná délka na místě kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Jméno objektu na místě kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Zeměpisná šířka na místě kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Úhel mezi předchozím a současným úsekem cesty."
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+msgid "The (compass) heading of the line segment being drawn."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The length of the new way segment being drawn."
 msgstr "Délka nového nakresleného segmentu trasy."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4523,9 +4521,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(žádný objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4541,4 +4539,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Vrstva ''{0}'' musí být v  seznamu vrstev"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Účelová komunikace"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "čínská"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Kanceláře"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5278,5 +5291,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "všechny"
@@ -5360,6 +5373,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5371,5 +5384,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5507,5 +5520,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Sady změn"
@@ -5566,5 +5579,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5725,5 +5738,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5731,5 +5744,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5737,5 +5750,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5743,5 +5756,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5749,5 +5762,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5756,5 +5769,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5762,5 +5775,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5768,5 +5781,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5774,24 +5787,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtrování je aktivní</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objektů skryto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objektů deaktivováno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5872,51 +5885,51 @@
 msgstr "Zavřít dialog a nevytvořit nový bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Otevřít seznam všech nahraných vrstev."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Smazat vybrané vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Přepnout viditelnost zvolené vrstvy."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Zobrazit/Skrýt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Přepnout viditelnost zvolené vrstvy."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Aktivovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Aktivovat vybranou vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Sloučit tuto vrstvu do jiné vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Duplikovat tuto vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Přesunout zvolenou vrstvu o řádek nahoru."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Přesunout zvolenou vrstvu o řádek dolů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Informace o vrstvě"
@@ -5926,5 +5939,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relace"
@@ -7084,6 +7097,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7131,107 +7145,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Název"
@@ -7576,5 +7590,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7662,5 +7676,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<různé>"
@@ -8413,5 +8427,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Hranice"
@@ -8484,8 +8498,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Typ"
@@ -8514,6 +8528,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "neznámý"
@@ -8853,5 +8867,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Objeveny konflikty"
@@ -8922,14 +8936,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Napište stručný komentář ke změnám, které nahráváte na server:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Zadejte komentář k nahrávání (min. 3 znaky)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Neplatný komentář k nahrávání"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "ID sady změn:"
@@ -9368,5 +9383,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Nahrát na server"
@@ -9388,5 +9403,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9394,60 +9409,94 @@
 msgstr "Nastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Tagy nové sady změn"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr "Spravovat otevřené sady změn a výběr sad k nahrání"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Konfigurovat pokročilé nastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Nahrát na ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Nahrát změny na server"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Nahrát změněné objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Prosím zadejte komentář k nahrávání této sady změn (min. 3 znaky)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Neplatný komentář k nahrávání"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Obrátit"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Pokračovat"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Přejít na předchozí stránku"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Toto již víckrát neukazovat"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Prosím, zadejte nejprve platnou velikost bloku"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Neplatná velikost bloku"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Zrušit nahrávání na server a pokračovat v editaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9803,103 +9852,11 @@
 msgstr[2] "{0} smazaných objektů:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "gps bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Přizpůsobit kreslení linií"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Použít globální nastavení."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Kreslit spojnice mezi body v této vrstvě"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Nereslit spojnice mezi body v této vrstvě"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Přizpůsobit barvu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Výchozí"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Zvolit barvu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Značky z pojmenovaných bodů"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Pojmenované body z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Importovat zvuk"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Import není možný"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audiosoubory (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Audio značky z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importovat obrázky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9907,5 +9864,5 @@
 msgstr "Jméno: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9913,5 +9870,5 @@
 msgstr "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9921,23 +9878,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Popis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Časový interval"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Délka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Délka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9947,5 +9904,5 @@
 msgstr[2] "{0} trasy, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9955,10 +9912,10 @@
 msgstr[2] "{0} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Převést do datové vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9968,21 +9925,21 @@
 "<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Převedeno z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9990,10 +9947,10 @@
 msgstr "Stáhnout data z OSM podél této trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Stáhnout vše v rozmezí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10001,10 +9958,10 @@
 msgstr "{0} metrů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximální plocha na požadavek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10012,21 +9969,21 @@
 msgstr "{0} čtverečních km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr "Stáhnout poblíž:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr "pouze trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr "pouze značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr "trasy a značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10038,9 +9995,9 @@
 "pokračovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10048,5 +10005,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10056,23 +10013,115 @@
 "byly vynechány."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Přizpůsobit kreslení linií"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Použít globální nastavení."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Kreslit spojnice mezi body v této vrstvě"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Nereslit spojnice mezi body v této vrstvě"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Přizpůsobit barvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Výchozí"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Zvolit barvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Značky z pojmenovaných bodů"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Pojmenované body z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Importovat zvuk"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Import není možný"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audiosoubory (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Audio značky z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importovat obrázky"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datová vrstva {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "mimo stažený areál"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "verze {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10082,11 +10131,11 @@
 msgstr[2] "Bylo nalezeno {0} konfliktů."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Klikněte pro uzavření tohoto dialogu a návrat k editaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10096,36 +10145,36 @@
 msgstr[2] "{0} smazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skládá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "nenastaveno"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "Verze API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Převédst do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Test konzistence dat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "Nenalezen žádný problém"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Nalezeny následující problémy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10133,5 +10182,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10140,5 +10189,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10147,5 +10196,5 @@
 msgstr[2] "body"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10155,5 +10204,5 @@
 msgstr[2] "trasy s {0} body"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10163,5 +10212,5 @@
 msgstr[2] "{0} se skládá z {1} tras"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10171,24 +10220,28 @@
 msgstr[2] "{0} bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Korelovat vůči GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Soubory GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Soubor {0} je načten pod jménem \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Chyba při parsování {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nemůžu číst \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10200,34 +10253,34 @@
 "pásmo<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Čas fotografie (z exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Čas GPS (načten z předchozích fotografií): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/rrrr hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Jsem v časovém pásmu: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Žádné datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Otevřít další fotografie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchronizovat čas z fotografie GPS přijímače"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10237,93 +10290,93 @@
 "Prosíme, použijte požadvaný formát"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Neplatné datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Není nahraná GPX trasa>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX trasa: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Otevřít jinou GPX trasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Auto-odhad"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Ruční srovnání"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Zobrazovat náhledy obrázků v mapě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Časové pásmo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Posun:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Korelovat obrázky s GPX trasou"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Korelovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Nepatné časové pásmo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Neplatný posun"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Zkusit znovu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10333,20 +10386,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Časová zóna: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuty: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekundy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10355,5 +10408,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10361,21 +10414,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Dosazení fotografií do trasy selhalo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Upravit časovou zónu a posun"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "Zvolené fotografie neobsahují informace o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Fotografie neobsahují informace o čase"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10383,17 +10436,17 @@
 msgstr "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX trasa neobsahuje časové údaje"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Měli byste vybrat GPX trasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Není vybrána GPX trasa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10404,5 +10457,5 @@
 "Očekávaný formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10413,56 +10466,52 @@
 "Očekávaný formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrahovat pozice GPS z EXIFu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Začínam prohledávat adresář"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Načíst fotografie..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Čtu {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Nemohu najít výchozí cesto pro adresář {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prohledávám adresář {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Nalezen nulový soubor v adresáři {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Chyba při získávání souborů z adresáře {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS souřadnicemi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Korelovat vůči GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10472,5 +10521,5 @@
 msgstr[2] "{0} obrázků nahráno."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10479,10 +10528,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Smazat obrázek z disku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10491,5 +10540,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "Soubor s obrázkem nebylo možné smazat."
@@ -10591,9 +10640,9 @@
 msgstr "JPEG obrázky (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps značka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10602,5 +10651,5 @@
 msgstr[2] "značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10610,9 +10659,21 @@
 msgstr[2] "{0} se skládá z  {1} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "Zobrazit text/ikony"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Přepnout viditelnost textu značek a ikon."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Synchronizovat audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10620,5 +10681,5 @@
 "Audio je třeba pozastavit v okamžiku, kdy uslyšíte synchronizační impuls."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10626,30 +10687,18 @@
 msgstr "Zvuk zesynchronizován na bodu {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Není možno synchronizovat v již přehrávané vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr "Zobrazit text/ikony"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Přepnout viditelnost textu značek a ikon."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11513,4 +11562,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Žádný"
@@ -11525,5 +11575,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11627,5 +11677,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Jen zajímavé směry (např. jednosměrka)"
@@ -11633,5 +11683,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Pouze na prvním úseku cesty."
@@ -11661,5 +11711,20 @@
 msgstr "Vytvořit značky při čtení GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Autor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Nafta"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Loď"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11667,9 +11732,9 @@
 msgstr "Automaticky vytvořit vrstvu se značkami při otevírání GPX vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Kreslit čáru mezi body GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11677,9 +11742,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Maximální délka lokálních souborů (v metrech)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11688,10 +11753,10 @@
 "kreslení všech linií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Maximální délka (metrů)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11699,15 +11764,15 @@
 "Vynutit kreslení čar, pokud importovaná data neobsahují informace o čarách."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Zobrazovat šipky pro čary spojující GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "Zobrazovat směrové šipky pomocí tabulek místo komplexní matematiky."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11715,13 +11780,13 @@
 msgstr "Nekreslit šipky, pokud nejsou alespoň tuto vzdálenost od předchozí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Minimální vzdálenost (pixelů)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovat větší tečky pro GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11731,9 +11796,9 @@
 "v kartě vrstev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Obarvovat body a části trasy podle rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11741,46 +11806,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Umožní ladit barvy cesty pro rozdílné průměrné rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Barvy tras a bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Zobrazovat směr u segmentů cesty."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Zobrazovat pořadí u všech segmentů v cestách."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovat hranice dat stažených ze serveru."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Vykreslovat křížky uprostřed cest ve výběrovém módu."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovat neaktivní vrstvy dat jinou barvou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM data"
@@ -12145,21 +12218,26 @@
 msgstr "Některá nastavení se projeví až po restartování JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Metoda projekce"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Kód projekce"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Zobrazovat souřadnice jako"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Metoda projekce"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Kód projekce"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Vrstva pro prováděná měření"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Projekce mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12725,5 +12803,5 @@
 msgstr "Přidat nový tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12732,49 +12810,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Více informací o tomto přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "Dostupné role"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr "role"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr "počet"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Volitelné atributy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznámý typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12784,15 +12862,15 @@
 msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba parsování {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Objekty typu {0} nejsou podporovány."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12803,17 +12881,17 @@
 msgstr[2] "Změnit {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Nic není zvoleno!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Vybrány nevhodné objekty!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Aplikovat přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12831,7 +12909,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Hledání: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12840,17 +12917,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Hledat objekty"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Zobrazovat lokalizované názvy v seznamu prvků"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Hledání: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13151,5 +13225,5 @@
 msgstr "Parsování souboru \"{0}\" selhalo"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Chyba parsování: Chybná struktura GPX dokumentu"
@@ -14643,5 +14717,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14910,5 +14984,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Interpolace adres"
@@ -15250,41 +15324,41 @@
 msgstr "Toto již víckrát neukazovat"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "Adresa budovy"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "Číslo domu:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Ulice:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Vzestupně"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Sestupně"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Čísla:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15301,25 +15375,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Nastavit rozměry budov"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "Zadat  adresu budovy"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Šířka budov:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr "Délka kroku:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15357,18 +15431,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Budovy"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Ulice"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15600,8 +15674,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "voda"
@@ -15662,6 +15736,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "adresa"
@@ -16143,34 +16217,34 @@
 "Nejdříve vyberte jednu z nich a potom zopakujte"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Prázdná vrstva"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS vrstva ({0}), nahráno {1} dlaždic"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Není vektorizovaný."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Velikost rastru: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "Je vektorizovaný."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16181,15 +16255,15 @@
 "Vytvořte nový soubor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Chyba formátu cache"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+"Lambertova zóne {0} v cache nekompatibilní se současnou Lambertovou zónou {1}"
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-"Lambertova zóne {0} v cache nekompatibilní se současnou Lambertovou zónou {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr "Chyba Lambertovy zóny v cache"
@@ -16268,22 +16342,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Stáhnout objekt..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Vybrat ke stažení dat z OSM ve vybrané oblasti."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Stáhnout nyní"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Prosím zvol aspoň jeden úkol ke stažení"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16293,12 +16363,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Test {0}/{1}: Spouští se {2}"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Chyba při čtení {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16329,9 +16399,9 @@
 msgstr "Vytvořit duplikát cesty"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Vrstva pro editaci GPX tras"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konvertovat do GPX vrstvy s anonymizací času"
@@ -16341,5 +16411,5 @@
 msgstr "UpravitGpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "Upravit trasu GPX"
@@ -16348,11 +16418,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Importovat cestu z GPX vrstvy"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Zahodit existující cestu"
@@ -16362,5 +16432,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Nenalezena vrstva s GPX daty."
@@ -16370,13 +16440,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16618,5 +16688,5 @@
 msgstr "Zobrazit negeotagované fotografie"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Importované obrázky"
@@ -16977,8 +17047,6 @@
 msgstr "Otevřít okno s měřením."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Reset"
@@ -17009,5 +17077,5 @@
 msgstr "Úhel mezi dvěmi zvolenými uzly"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Vrstva pro prováděná měření"
@@ -17099,5 +17167,5 @@
 msgstr "Stahovací smyčka OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Zobrazuje chyby z OpenStreetBugs"
@@ -17169,13 +17237,13 @@
 msgstr "Fronta"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "offline"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "online"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17291,94 +17359,94 @@
 msgstr "Spustitelný soubor Firefoxu"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "Chyba při čtení!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "nastavení"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "nechávat záložní soubory"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "změnit datum modifikace soubory:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "na gps čas"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "na předchozí hodnotu (nezměněný čas)"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "Nelze přečíst čas modifikace."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "Nelze zapsat čas modifikace."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "Soubor nemohl být smazán!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "Nepovedlo se přejmenování souboru!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "Přepsat staré záložní soubory?"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "Nepodařilo se smazat dočasný soubor!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "Test selhal: nelze přečíst čas modifikace."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "Test selhal: nelze zapsat čas modifikace."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr ""
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -17419,9 +17487,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17599,20 +17667,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "finální verze:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "potvrzovat ručně všechny akce Dálkového ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Plugin umožňující ovládání JOSM z jiných aplikací."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Dálkové ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Nastavení pro plugin \"Remote Control\""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17624,50 +17697,58 @@
 "využívající tento plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Povolené akce"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Dálkové ovládání bylo požádáno o nahrání dat z API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaily požadavku: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Chcete toto povolit?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Potvrdit akci dálkového ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Dálkové ovládání bylo požádáno o import dat z následujícího URL:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr "Vrátit zpět celou sadu změn"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr "Vrátit zpět pouze výběr"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr "Vrátit zpět výběr a obnovit smazané objekty"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17675,5 +17756,5 @@
 msgstr "Vrátit zpět sadu změn"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Vrátit zpět"
@@ -17874,41 +17955,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Aktuální mapa"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Automatické přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Nahrát dlaždici"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Nahrát všechny dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Zvětšit přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Zmenšit přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Vyprázdnit cache dlaždic"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "obrázek "
@@ -18212,4 +18293,14 @@
 msgid "Terrace"
 msgstr "Řada domů"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Oddělovač"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18908,6 +18999,6 @@
 msgstr "Přidat chybějící tag {0}={1}"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18920,9 +19011,9 @@
 "napojena na cestu <span class=\"object-name\">{3}</span>."
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr "Rozdělit teď"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -19001,6 +19092,6 @@
 msgstr "Nalezeno {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19008,5 +19099,5 @@
 msgstr "Chyby kontroly"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Žádné chyby při kontrole"
@@ -19246,32 +19337,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Sloučit duplicitní body?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Duplicitní uzly"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Duplicitní uzly"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Sloučit duplicitní body?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Duplicitní uzly"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Sloučit duplicitní body?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19310,5 +19395,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19833,5 +19918,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "oblast"
@@ -19967,10 +20052,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -20116,10 +20201,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20308,9 +20393,5 @@
 "Toto může vést ke špatným souřadnicím."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automatické stahování"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -20319,19 +20400,19 @@
 "url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(deaktivované)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, 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:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20346,17 +20427,17 @@
 "znovu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Ano, stahovat obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "Neplatné URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Nahrát viditelné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20364,48 +20445,52 @@
 "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Změnit rozlišení"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Znovu nahrát chybné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Uložit WMS vrstvu do souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Uložit WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Nahrát WMS vrstvu ze souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Načíst vrstvu WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Chyba formátu souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Chyba při nahrávání souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Nastavit záložku WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automatické stahování"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20484,5 +20569,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20519,5 +20604,5 @@
 msgstr "Audio zařízení je nedostupné"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20538,5 +20623,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "les"
@@ -20549,78 +20634,67 @@
 #. relation type
 #: build/specialmessages.java:17
-#, fuzzy
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr "vytvořit relaci associatedStreet"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "hranice"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Vzestupně"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "vedení"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "multipolygon"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Síť"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "veřejná doprava"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Omezení"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "cesta"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "místo"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "vodní tok"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20900,7 +20974,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Stáhnout data z OSM podél této trasy"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -21118,6 +21191,11 @@
 msgstr "Vytváření řadových domků z jednotlivých bloků."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21126,5 +21204,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21135,5 +21213,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21144,10 +21222,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 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:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21158,5 +21236,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21166,5 +21244,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21175,15 +21253,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Snadné stahovaní velmi dlouhých propojených cest"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 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:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21192,5 +21270,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21324,5 +21402,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Číslo"
@@ -21861,5 +21939,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "kov"
@@ -21872,5 +21950,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "Prales"
@@ -22174,9 +22252,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "ano"
@@ -22286,9 +22364,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "ne"
@@ -22547,5 +22625,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "obytná oblast"
@@ -22594,5 +22672,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "obslužná cesta"
@@ -22627,5 +22705,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "konstrukce"
@@ -22712,5 +22790,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "turistická"
@@ -22745,5 +22823,5 @@
 msgstr "dobrá"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "pro středně pokročilé (červená)"
@@ -22913,14 +22991,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operátor"
@@ -23188,6 +23266,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Nadmořská výška"
@@ -23635,5 +23713,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "mokřina"
@@ -24039,5 +24117,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Napětí"
@@ -24401,31 +24479,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Otevírací doba"
@@ -24485,90 +24563,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pá 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Út-Ne 08:00-15:00; So 08:00-12:00"
@@ -24681,7 +24759,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Číslo záchodu"
@@ -24697,5 +24775,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "podzemní"
@@ -24708,6 +24786,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Poplatek"
@@ -24883,5 +24961,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Invalidní vozík"
@@ -24918,6 +24996,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Přístřešek"
@@ -24925,5 +25003,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Lavička"
@@ -25042,5 +25120,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Vodní bój"
@@ -25201,5 +25279,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Kuchyně"
@@ -25207,73 +25285,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "čínská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "řecká"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "německá"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "místní"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asijská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Rychlé občersvení"
@@ -25281,17 +25364,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Upravit rychlé občerstvení"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Kavárna"
@@ -25299,9 +25382,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Upravit kavárnu"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Hospoda"
@@ -25309,18 +25392,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Upravit hospodu"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Hospoda-zahrádka"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Upravit hospoda-zahrádka"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar"
@@ -25328,9 +25412,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Upravit bar"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Noční klub"
@@ -25338,24 +25422,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Upravit noční klub"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Atrakce"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Upravit atrakci"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Muzeum"
@@ -25363,9 +25447,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Upravit muzeum"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -25374,9 +25458,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Upravit zoo"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Vyhlídka"
@@ -25384,24 +25468,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Upravit vyhlídku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Vyhlídková věž"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Zábavní park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Upravit zábavní park"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Umělecké dílo"
@@ -25409,5 +25493,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Upravit umělecké dílo"
@@ -25415,19 +25499,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Turistické informační centrum"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Přehledová mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Úroveň detailů"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "topografická"
@@ -25465,5 +25549,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25471,28 +25555,28 @@
 msgstr "ulice"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "orientační"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Zobrazený areál"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "místo"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "město"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -25502,5 +25586,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Trasy zobrazeny pro:"
@@ -25508,5 +25592,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "turistická stezka"
@@ -25514,6 +25598,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -25521,5 +25605,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Jízda na horském kole"
@@ -25527,6 +25611,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Lyžování"
@@ -25534,5 +25618,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Jízda na koni"
@@ -25540,46 +25624,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Informační nástěnka"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Obsah tabule"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "upozornění"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "informace o historii"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "informace o přírodě"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "informace o divokých zvířatech"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Rozcestník"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "stožár"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Informační terminál"
@@ -25587,29 +25679,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Bližší popis"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Audioprůvodce"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Audioprůvodce přes mobilní telefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Telefonní číslo"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Jiný informační bod"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Upravit přístřešek"
@@ -25617,25 +25709,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Ohniště"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Místo na piknik"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Upravit místo na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Historická místa"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Zámek/Hrad"
@@ -25644,19 +25736,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Upravit zámek/hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Zřícenina"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Upravit zříceninu"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Archeologické naleziště"
@@ -25665,9 +25757,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Upravit archeologické naleziště"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Bojiště"
@@ -25675,10 +25767,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Upravit bojiště"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Paleontologické naleziště"
@@ -25686,5 +25778,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Upravit paleontologické naleziště"
@@ -25692,15 +25784,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Upravit monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Památník"
@@ -25708,55 +25800,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Upravit památník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Kříž"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Upravit kříž"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Boží muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Upravit boží muka"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Hraniční kameny"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Upravit hraniční kameny"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Volný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Akvapark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Upravit akvapark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Hřiště"
@@ -25764,35 +25856,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Upravit hřiště"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Rybaření"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Upravit rybaření"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Sportovní potřeby"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Sportovní zařízení"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Upravit stadion"
@@ -25806,6 +25898,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "vyberte sport:"
@@ -26221,31 +26313,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "sport"
@@ -26255,240 +26347,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "kombinovaný"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "lukostřelba"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "australský fotbal"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "Hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "kanoistika"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "Horolezení"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "cyklistika"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "závody psů"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "krasojízda"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "dostihy"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "motoristické sporty"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota (míčová hra)"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "pálkové (raketové) sporty"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "střelba"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "bruslení"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "lyžování"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "plavání"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "stolní tenis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Sportovní centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Upravit sportovní centrum"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Hřiště"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Upravit hřiště"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Závodní trať"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Upravit závodní trať"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golfové hřiště"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Upravit golfové hřiště"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Upravit minigolf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Kombinováné"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Upravit kombinované"
@@ -26530,23 +26622,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "typ"
@@ -26588,211 +26680,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "hřiště"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "sportovní centrum"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Upravit bowling"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Upravit atletiku"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Lukostřelba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Upravit lukostřelbu"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Horolezení"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Upravit horolezení"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Upravit kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Upravit cyklistiku"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Závody psů"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Upravit závody psů"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Krasojízda"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Upravit krasojízdu"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Upravit dostihy"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Upravit gymnastiku"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Motorové sporty"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Upravit motorové sporty"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Bruslení"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Upravit bruslení"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Upravit Skateboard"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Plavání"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Upravit plavání"
@@ -26800,52 +26892,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Upravit lyžování"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Typ sjezdovky"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "Sjezdovka"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "Běžecká trať"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Obtížnost"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "pro začátečníky (zelená)"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "jednoduchá (modrá)"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "pro zkušené (černá)"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "pro experty (oranžová)"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "volný terén - freeride (žlutá)"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Střelba"
@@ -26853,204 +26945,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Upravit střelbu"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Sport (míčové hry)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Fotbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Australský fotbal"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Upravit australský fotbal"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Upravit baseball"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Upravit basketbal"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Upravit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golfové hřiště"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Hry s koulemi (např. pétanque)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Upravit hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Upravit Bowls"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Upravit kriket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Ohražené místo pro tréning kriketu"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Upravit ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Upravit kroket"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Upravit hokej"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota (míčová hra)"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Upravit pelotu (míčová hra)"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Pálkové (raketové) sporty"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Upravit pálkové (raketové) sporty"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Stolní tenis (ping-pong)"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Upravit stolní tenis (ping-pong)"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Upravit tenis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Objekty a další POI"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Budova"
@@ -27058,5 +27150,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Veřejná budova"
@@ -27064,10 +27156,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Upravit veřejnou budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Radnice"
@@ -27075,10 +27167,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Upravit radnici"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Ambasáda"
@@ -27086,10 +27178,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Upravit ambasádu"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Soud"
@@ -27098,10 +27190,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Upravit soud"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Vězení"
@@ -27110,10 +27202,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Upravit vězení"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Policie"
@@ -27123,10 +27215,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Upravit policii"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Hasičská stanice"
@@ -27135,10 +27227,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Upravit hasičskou stanici"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Pošta"
@@ -27146,5 +27238,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Upravit poštu"
@@ -27152,15 +27244,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Mateřská škola"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Upravit mateřskou školu"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Základní škola"
@@ -27168,10 +27260,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Upravit školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Vysoká škola"
@@ -27179,10 +27271,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Upravit vysokou školu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Střední škola"
@@ -27190,5 +27282,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Upravit střední školu"
@@ -27196,5 +27288,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Kino"
@@ -27203,10 +27295,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Upravit kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Knihovna"
@@ -27215,9 +27307,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Upravit knihovnu"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Komunitní umělecké centrum"
@@ -27225,10 +27317,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Upravit komunitní umělecké centrum"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Divadlo"
@@ -27237,10 +27329,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Upravit divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Chrám(kostel, synagoga, mešita)"
@@ -27250,5 +27342,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Upravit chrám"
@@ -27257,6 +27349,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Náboženství"
@@ -27265,66 +27357,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahá'í"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "budhistické"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "křesťanské"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hindské"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "džinistické"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "židovské"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "muslimské"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "spiritualistické"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoistické"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "Unitářské"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastristické"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Vyznání"
@@ -27333,81 +27425,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglikánské"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptistické"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "katolické"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evangelické"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "svědkové Jehovovi"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "luteránské"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "metodistické"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormonské"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "pravoslavné"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pentekostalistické"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbyteriánské"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestantské"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "kvakerské"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "ší'itské"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunnitské"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Adresy"
@@ -27416,5 +27508,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Upravit informace o adrese"
@@ -27422,5 +27514,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Číslo domu"
@@ -27428,25 +27520,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Jméno domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Ulice"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Jméno města"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Poštovní směrovací číslo"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Kód země"
@@ -27455,5 +27547,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Upravit interpolaci adres"
@@ -27461,61 +27553,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Schéma číslování"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "liché"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "sudé"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "abecední"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Inženýrské objekty"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Továrna"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Upravit továrnu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Věž"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Upravit věž"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Typ věže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "telekomunikační"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "pozorovací"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Výška (metrů)"
@@ -27523,25 +27615,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Upravit vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Plynojem"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Upravit plynojem"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Maják"
@@ -27549,10 +27641,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Upravit maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Větrný mlýn"
@@ -27560,10 +27652,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Upravit větrný mlýn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Potrubí"
@@ -27572,41 +27664,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Upravit potrubí"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "plynová"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "teplo"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "ropa"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "kanalizace"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Umístění"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "podvodní"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "nadzemní"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Čistička odpadních vod"
@@ -27616,10 +27708,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Upravit čističku odpadních vod"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Jeřáb"
@@ -27627,5 +27719,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Upravit jeřáb"
@@ -27633,10 +27725,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Editovat vodní bój"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Triangulační bod"
@@ -27644,10 +27736,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Upravit triangulační bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Sledovací kamera"
@@ -27655,23 +27747,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Upravit sledovací kameru"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "vnitřní"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "venkovní"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Elektrárna"
@@ -27681,35 +27773,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Upravit elektrárnu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "větrná"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "vodní"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fosilní paliva"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "jaderná"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "uhelná"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "sluneční"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Rozvodna"
@@ -27718,10 +27810,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Upravit rozvodnu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Trafostanice"
@@ -27730,5 +27822,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Upravit trafostanici"
@@ -27736,10 +27828,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Číslo vedení"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Stožár elektrického vedení"
@@ -27750,23 +27842,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Upravit stožár elektrického vedení"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "věž"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "stožár"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Dráty elektrického vedení"
@@ -27775,78 +27867,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Upravit dráty elektrického vedení"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Typ vedení"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "vedení"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "vedlejší vedení"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Počet kabelů"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Počet drátů (nebo lépe vodičů) na každém kabelu"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "jednoduchý"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "dvojitý"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "trojitý"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "čtveřitý"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Občanská vybavenost"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Záchody"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Poštovní schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefon"
@@ -27855,5 +27945,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Upravit telefon"
@@ -27861,5 +27951,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Mince"
@@ -27867,5 +27957,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Bankovky"
@@ -27873,5 +27963,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronické peněženky nebo kreditní karty."
@@ -27879,5 +27969,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Debetní karty"
@@ -27885,15 +27975,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Kreditní karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telefonní karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Recyklační stanoviště"
@@ -27902,5 +27992,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Upravit recyklační stanoviště"
@@ -27908,35 +27998,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Oblečení"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Kovový šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Odpadkový koš"
@@ -27944,5 +28034,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Upravit odpadkový koš"
@@ -27951,31 +28041,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Opěrka zad"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "kámen"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Barva"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "černá"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "hnědá"
@@ -28054,39 +28144,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "zeleň"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "šedá"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "bílá"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Počet sedadel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Upravit posed"
@@ -28095,30 +28185,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "nízká"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "střední"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "plná"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Úkryt"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Uzamknutelný"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Fontána"
@@ -28127,10 +28217,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Upravit fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -28139,10 +28229,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Upravit pitnou vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Požární hydrant"
@@ -28151,5 +28241,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Upravit požární hydrant"
@@ -28157,5 +28247,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Babybox"
@@ -28163,15 +28253,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Upravit babybox"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Prodejce automobilů"
@@ -28179,10 +28269,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Upravit obchod s auty"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Prodejce kol"
@@ -28191,28 +28281,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Upravit prodejnu kol"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Upravit supermarket"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Upravit drogerii"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Samoobsluha, smíšenka, večerka"
@@ -28220,9 +28310,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Upravit večerku"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosek"
@@ -28230,27 +28320,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Upravit kiosek"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Knihkupectví"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Upravit knihkupectví"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Cestovní kancelář"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Upravit cestovní kancelář"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Řeznictví"
@@ -28258,9 +28348,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Upravit řeznictví"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Pekařství"
@@ -28268,9 +28358,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Upravit pekařství"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Květinářství"
@@ -28278,18 +28368,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Upravit květinářství"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Obchod se zdravou výživou"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Upravit obchod se zdravou výživou"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -28297,54 +28387,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Upravit obchod s alkoholem"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Upravit obchod s nápoji"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Počítače"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Upravit obchod s počítači"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Upravit obchod s elektronikou"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Upravit obchod s hifi"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Nábytek"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Upravit obchod s nábytkem"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Zahradnické centrum"
@@ -28352,9 +28442,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Upravit zahradnické centrum"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Železářství"
@@ -28362,9 +28452,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Upravit železářství"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Zboží pro kutily"
@@ -28372,54 +28462,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Upravit obchod se zbožím pro kutily"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Papírnictví"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Upravit papírnictví"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Kadeřnictví"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Upravit Kadeřnictví"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Obuv"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuví"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Hračky"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Upravit obchod s hračkami"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Videopůjčovna/prodejna"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Upravit videopůjčovnu/prodejnu"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Čistírna"
@@ -28427,9 +28517,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Upravit čistírnu"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Prádelna"
@@ -28437,9 +28527,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Upravit prádelnu"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Vybavení do přírody"
@@ -28447,24 +28537,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Obchod s vybavením do přírody"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Upravit obchod se sportovními pořebami"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Oční optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Upravit oční optiku"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Prodejní automat"
@@ -28472,5 +28562,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Upravit prodejní automat"
@@ -28478,97 +28568,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Prodávané produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "lístky na městskou hromadnou dopravu"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "plány městské hromadné dopravy"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "parkovací lístky"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "jídlo"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "pití"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "krmivo pro zvířata"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "telefonní karty"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "poukazy"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "kondomy"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Zůstatkové nebo věrnostní karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Finance"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Banka"
@@ -28576,14 +28666,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Upravit banku"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Směnárna"
@@ -28591,5 +28681,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Upravit směnárnu"
@@ -28597,15 +28687,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Upravit bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Zdraví"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Zdavotní středisko, poliklinika"
@@ -28613,18 +28703,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Upravit zdravotní středisko, polikliniku"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Zubař"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Upravit zubařskou ordinaci"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Lékárna"
@@ -28632,5 +28722,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Upravit lékárnu"
@@ -28638,9 +28728,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Vydává léky na předpis"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Nemocnice"
@@ -28648,10 +28738,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Upravit nemocnici"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Místo pro kontaktování záchranářů"
@@ -28660,5 +28750,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Upravit místo pro kontaktování záchranářů"
@@ -28667,20 +28757,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Číslo místa"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Jméno místa"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Telefonní číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použijte mezinárodní zápis, např. +420123456789)"
@@ -28688,5 +28778,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Veterinář"
@@ -28695,64 +28785,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Upravit veterinární ordinaci"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Místa"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Upravit kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Stát"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Upravit stát"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Země"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Upravit zemi"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Kraj"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Upravit kraj"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Okres"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Upravit okres"
@@ -28760,15 +28850,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Velkoměsto"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Upravit velkoměsto"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Město"
@@ -28776,10 +28866,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Upravit město"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Městský obvod, nebo městská část"
@@ -28787,25 +28877,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Upravit městský obvod, nebo městská část"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Obec"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Upravit obci"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Samota"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Upravit samotu"
@@ -28813,5 +28903,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Místní název"
@@ -28819,10 +28909,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Editovat místní název"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Ostrov"
@@ -28830,10 +28920,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Upravit ostrov"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Ostrůvek"
@@ -28841,5 +28931,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Upravit ostrůvek"
@@ -28847,5 +28937,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Vstup do jeskyně"
@@ -28853,10 +28943,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Upravit vstup do jeskyně"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Vrchol"
@@ -28864,10 +28954,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Upravit vrchol"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Ledovec"
@@ -28875,10 +28965,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Upravit ledovec"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Sopka"
@@ -28886,70 +28976,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Upravit sopku"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Národní"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Upravit národní hranici"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administrativní"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Upravit administrativní hranici"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Upravit civilní hranici"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Volební obvod"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Upravit volební obvod"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Národní park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Upravit hranice národního parku"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Využití krajiny"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Strom"
@@ -28958,15 +29048,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Upravit strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Botanické jméno"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Prales"
@@ -28975,5 +29065,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Editovat Prales"
@@ -28981,17 +29071,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "jehličnatý"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "smíšený"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Les"
@@ -29000,14 +29090,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Upravit lesní plochu"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Přírodní rezervace"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Upravit přírodní rezervaci"
@@ -29015,25 +29105,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Suťoviště"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Upravit suťoviště"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Podrost"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Upravit podrost"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Travnatá pahorkatina"
@@ -29041,10 +29131,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Upravit travnatou pahorkatinu"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Vřesoviště"
@@ -29052,5 +29142,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Upravit vřesoviště"
@@ -29058,5 +29148,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Farma"
@@ -29065,45 +29155,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Upravit farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Zemědělská půda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Upravit zemědělskou půdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Louka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Upravit louku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Vinice"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Upravit vinici"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Zahrádkářská kolonie"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Upravit zahrádkářskou kolonii"
@@ -29111,25 +29201,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Zahrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Upravit zahradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Upravit travnatou plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Zelená plocha"
@@ -29137,10 +29227,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Upravit zelenou plochu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "veřejná zeleň (mimo parky)"
@@ -29148,20 +29238,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Upravit veřejnou zeleň"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Upravit park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Rekreační plocha"
@@ -29169,5 +29259,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upravit rekreační plochu"
@@ -29175,15 +29265,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Obytná plocha"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Upravit obytnou plochu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Malý hřbitov"
@@ -29191,9 +29281,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Upravit malý hřbitov"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Hřbitov"
@@ -29201,39 +29291,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Upravit hřbitov"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Obchody"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Upravit plochu s obchody"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Kanceláře"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Upravit kancelářskou plochu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Průmysl"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Upravit průmyslovou plochu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Železniční plocha"
@@ -29241,15 +29331,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Upravit železniční plochu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Vojenský prostor"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Upravit vojenský prostor"
@@ -29257,50 +29347,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Probíhající výstavba"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Upravit výstavbu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Stará zátěž, městské ruiny (Brownfield)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Upravit starou zátěž (Brownfield)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Upravit zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "skládka odpadu"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Upravit skládku odpadu"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Upravit lom"
@@ -29310,5 +29400,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Upravit multipolygon"
@@ -29320,5 +29410,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "vnější část"
@@ -29326,5 +29416,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "vnitřní část"
@@ -29332,5 +29422,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr "Hranice"
@@ -29341,5 +29431,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr "Upravit hranici"
@@ -29347,36 +29437,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr "Typ hranice"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr "administrativní"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr "národní"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr "civilní"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr "politická"
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr "Administrativní centrum"
@@ -29384,5 +29474,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Zákaz odbočení"
@@ -29391,5 +29481,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Upravit zákaz odbočení"
@@ -29397,34 +29487,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Omezení"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "zákaz odbočení vlevo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "zákaz odbočení vpravo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "zákaz jízdy rovně"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "zákaz otáčení"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "pouze odbočení vpravo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "pouze odbočení vlevo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "pouze jízda rovně"
@@ -29433,15 +29523,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "přes uzel nebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "na cestu"
@@ -29449,5 +29539,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Trasa"
@@ -29456,5 +29546,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Upravit trasu"
@@ -29462,5 +29552,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Typ trasy"
@@ -29568,5 +29658,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29577,17 +29667,17 @@
 msgstr "bicykl"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "silnice"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "trajekt"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "lyžařská"
@@ -29655,5 +29745,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29663,9 +29753,9 @@
 msgstr "pěší"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "tramvajová"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "objízdná"
@@ -29679,10 +29769,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Popis symbolu"
@@ -29690,31 +29780,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Síť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "navrhovaná"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "alternativní"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "dočasná"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "spojení"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Barva (hex)"
@@ -29723,30 +29813,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "segment trasy"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "dopředný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "zpětný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "zastávka"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "dopředná zastávka"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "zpětná zastávka"
@@ -29973,5 +30063,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "zastaralý"
@@ -30624,4 +30714,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30725,11 +30823,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr ""
@@ -31242,5 +31340,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "molo"
@@ -31254,5 +31352,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "potrubí"
@@ -31396,13 +31494,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "oddych (leisure)"
@@ -31416,5 +31514,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "přísav"
@@ -31510,10 +31608,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "občanská vybavenost"
@@ -31615,10 +31713,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -32056,24 +32154,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -32105,6 +32203,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "menší vodní plochy"
@@ -32165,8 +32263,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "zdravotnictví"
@@ -32519,26 +32617,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "obchod"
@@ -32610,8 +32708,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -32712,9 +32810,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turistika"
@@ -32802,9 +32900,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "historické"
@@ -32817,5 +32915,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "lom"
@@ -32829,5 +32927,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "skládka"
@@ -32849,5 +32947,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "nádrže"
@@ -32861,5 +32959,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "zemědělství"
@@ -32882,5 +32980,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "obchody"
@@ -32894,5 +32992,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "průmysl"
@@ -32906,5 +33004,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "stará zátěž, městské ruiny (Brownfield)"
@@ -32918,5 +33016,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "Zastavitelné území (Greenfield)"
@@ -32930,5 +33028,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "železniční plochy"
@@ -32985,7 +33083,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "vojenský"
@@ -32999,5 +33097,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "hřbitov"
@@ -33010,5 +33108,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "vrchol"
@@ -33023,5 +33121,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "ledovec"
@@ -33035,5 +33133,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "sopka"
@@ -33088,8 +33186,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "přírodní"
@@ -33103,5 +33201,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "křoví"
@@ -33115,5 +33213,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "vřesoviště"
@@ -33127,5 +33225,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "zalesněné území"
@@ -33139,5 +33237,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "bahno"
@@ -33151,5 +33249,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "pláž"
@@ -33227,8 +33325,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "cesta"
@@ -33317,12 +33415,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "hranice"
@@ -33472,11 +33570,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "místo"
@@ -33490,5 +33588,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "tiger_data"
@@ -33844,6 +33942,18 @@
 msgstr "Sicily - Itálie"
 
-#~ msgid "closedway"
-#~ msgstr "uzavřená cesta"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Označená cesta neobsahuje vybraný uzel."
+#~ msgstr[1] "Označené cesty neobsahují vybraný uzel."
+#~ msgstr[2] "Označené cesty neobsahují vybrané uzly."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Stupně minuty sekundy"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Zadejte komentář k nahrávání (min. 3 znaky)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "Prosím zadejte komentář k nahrávání této sady změn (min. 3 znaky)"
 
 #~ msgid "Email"
@@ -33891,7 +34001,4 @@
 #~ msgid "their version:"
 #~ msgstr "verze na serveru:"
-
-#~ msgid "resolved version:"
-#~ msgstr "finální verze:"
 
 #~ msgid "my version:"
@@ -34011,7 +34118,4 @@
 #~ msgid "All the ways were empty"
 #~ msgstr "Všechny cesty byli prázdné"
-
-#~ msgid "Boat"
-#~ msgstr "Loď"
 
 #~ msgid "Motorboat"
@@ -34416,4 +34520,7 @@
 #~ msgid "Cannot read place search results from server"
 #~ msgstr "Nemohu načíst výsledky hledání ze serveru"
+
+#~ msgid "closedway"
+#~ msgstr "uzavřená cesta"
 
 #~ msgid "Occupied By"
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 22568)
+++ applications/editors/josm/i18n/po/da.po	(revision 22569)
@@ -9,7 +9,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-11 19:58+0000\n"
-"Last-Translator: Esben Damgaard <ebbe@skummer.com>\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-31 09:55+0000\n"
+"Last-Translator: Lasse Luttermann <luttermann@silenzio.dk>\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-07-28 09:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -24,5 +24,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -53,14 +53,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -77,9 +76,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -122,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -160,5 +159,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -232,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -246,5 +245,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -264,11 +263,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -276,20 +276,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -322,5 +322,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Sammenflet"
@@ -390,5 +390,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -402,5 +402,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -422,4 +422,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -436,6 +437,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -447,5 +448,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -580,22 +581,22 @@
 msgstr "Downloader åbne rettesæt ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Kombinér veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Kombinér flere veje til én"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Skift retninger?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Reversér og kombinér"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -605,5 +606,5 @@
 "nogle af dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -612,10 +613,10 @@
 "Kunne ikke kombinere veje (de kunne ikke samles i en enkelt række punkter)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Kombiner {0} veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Vælg mindst to veje at kombinere."
@@ -662,10 +663,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -745,5 +746,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:47
 msgid "Download referrers"
-msgstr ""
+msgstr "Download referencer"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:48
@@ -789,5 +790,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
 msgid "Invalid ID specified. Cannot download object."
-msgstr ""
+msgstr "Ugyldigt ID. Kan ikke downloade objekt."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
@@ -803,5 +804,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -867,10 +868,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Eksporter til GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Eksporter dataene til GPX-fil."
@@ -1062,5 +1063,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1203,5 +1204,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map layer."
-msgstr ""
+msgstr "Opret nyt kort-lag"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47
@@ -1488,20 +1489,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1525,5 +1526,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1534,6 +1535,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Fejl"
@@ -1560,5 +1561,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1566,5 +1567,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Gem nuværende data."
@@ -1621,10 +1622,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Gem som..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Gem de nuværende data i en ny fil."
@@ -1669,5 +1670,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1690,9 +1691,9 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:69
 msgid "Delete nodes outside of downloaded data regions"
-msgstr ""
+msgstr "Slet punkter udenfor de downloadede områder"
 
 #: ../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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Nej, afbryd"
@@ -1713,5 +1714,5 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:75
 msgid "Delete nodes outside of data regions?"
-msgstr ""
+msgstr "Slet punkter udenfor de downloadede områder?"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:101
@@ -1761,18 +1762,24 @@
 msgstr[1] "Forenkl vej (fjern {0} punkter)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Opdel vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Opdel en vej ved det markerede punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Det markerede kan ikke opdeles"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "De valgte punkter deler ikke samme vej."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1780,5 +1787,5 @@
 msgstr[1] "De valgte punkter er ikke i midten af nogen vej."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1792,20 +1799,10 @@
 "Der er mere end én vej, som bruger de punkter, du har valgt. Vælg også vejen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "De valgte punkter deler ikke samme vej."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Den valgte vej indeholder ikke det valgte punkt."
-msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Du skal vælge mindst to punkter for at opdele en kredsformig vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1815,5 +1812,5 @@
 "vejen.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1823,5 +1820,5 @@
 "<br>Du bør kontrollere dette og om nødvendigt korrigere det.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1831,5 +1828,5 @@
 "kontrollere dette og om nødvendigt korrigere det.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1980,5 +1977,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2990,22 +2987,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3152,25 +3149,25 @@
 msgstr "Kan ikke løse uafklaret konflikt"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr "Mindst et objekt at slette påkrævet. Har tom markering."
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Slet punkt {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Slet vej {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Slet relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3179,5 +3176,5 @@
 msgstr[1] "Slet {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3186,5 +3183,5 @@
 msgstr[1] "Slet {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3193,5 +3190,5 @@
 msgstr[1] "Slet {0} veje"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3200,5 +3197,5 @@
 msgstr[1] "Slet {0} relationer"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3353,5 +3350,5 @@
 msgstr "Udfør?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3426,17 +3423,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Fejl ved hentning af filer fra mappen {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Slet gammel udvidelsesfil {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Fejl ved oprettelse af mellemlager-mappe: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3628,42 +3625,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Grader minutter sekunder"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "V"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "Ø"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3673,5 +3673,5 @@
 "allerede er inkluderet"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3850,5 +3850,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "baggrund"
@@ -3994,5 +3994,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Vis ikke igen (husker valg)"
@@ -4020,5 +4020,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "jernbane"
@@ -4040,6 +4040,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4108,5 +4108,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "bygning"
@@ -4193,5 +4193,5 @@
 msgstr "Objekt slettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4293,69 +4293,69 @@
 msgstr "Adgangskode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "brug"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "valgmuligheder"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Vis denne hjælp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometrisk argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Download afgrænsningsfeltet"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download stedet fra URL'en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Åbn en fil (enhver filtype der kan åbnes med Fil/Åbn)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Download afgrænsningsfeltet som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download stedet ved URL'en (med bredde=x&længde=y&zoom=z) som rå GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Vælg med den givne søgning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Start op i maksimeret tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Nulstil indstillingerne til standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Indstil sproget"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "options givet som Java systemegenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/STI/TIL/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Ændr folderen for alle bruger indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4369,9 +4369,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4379,46 +4379,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Vær sikker på at du indlæser nogle data hvis du bruger --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialiserer"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Opdaterer plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Installerer opdaterede plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Henter indledende udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Sætter standardværdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Opretter hovedgrænseflade"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Henter udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Løs"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4427,5 +4426,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4521,33 +4520,33 @@
 msgstr "Zoom ud"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "skalér"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Den geografiske længdegrad ved musemarkøren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Navnet på objektet ved musemarkøren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Den geografiske breddegrad ved musemarkøren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Vinklen mellem det forrige og det nuværende vejstykke."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "(Kompas)retningen af det tegnede linjestykke."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Længden af det nytegnede vejstykke."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4557,9 +4556,9 @@
 "liste med musen.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4575,4 +4574,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Lag \"{0}\" skal være i liste over lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Numerisk"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "kinesisk"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Mindesmærke"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5319,5 +5333,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "alle"
@@ -5401,6 +5415,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5411,5 +5425,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5561,5 +5575,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Rettesæt"
@@ -5620,5 +5634,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5781,5 +5795,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5787,5 +5801,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5793,5 +5807,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5799,5 +5813,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5805,5 +5819,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5812,5 +5826,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5818,5 +5832,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5824,5 +5838,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5830,24 +5844,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objekter skjult"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5927,51 +5941,51 @@
 msgstr "Luk dialogen uden at oprette et nyt punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Åbn en liste over alle hentede lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Slet de markerede lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Slå synligheden for det valgte lag til/fra"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Vis/skjul"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Slå synligheden for det valgte lag til/fra"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Aktivér"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Aktiver de markerede lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Flet dette lag ind i et andet lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Flyt det valgte lag en række op."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Flyt det valgte lag en række ned."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Information om lag"
@@ -5981,5 +5995,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relationer"
@@ -7144,6 +7158,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7191,107 +7206,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Navn"
@@ -7655,5 +7670,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7743,5 +7758,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<forskellige>"
@@ -8508,5 +8523,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Afgrænsninger"
@@ -8579,8 +8594,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Type"
@@ -8609,6 +8624,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "ukendt"
@@ -8947,5 +8962,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Konflikter opdaget"
@@ -9016,14 +9031,15 @@
 "Advarsel: Fejloverskrift \"{0}\" matchede ikke med et forventet mønster"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Angiv en kort kommentar for de ændringer du uploader:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Indtast en upload-kommentar (min. 3 tegn)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Ulovlig upload-kommentar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "Rettesæts-ID"
@@ -9477,5 +9493,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Upload"
@@ -9497,5 +9513,5 @@
 msgstr "Initialiserer relationer der skal opdateres ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9503,60 +9519,94 @@
 msgstr "Indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "Afgør hvordan data skal uploades og hvilket rettesæt der skal bruges"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Det nye rettesæts tags"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Tilføj tags til det rettesæt, data bliver uploadet til"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr "Håndtér åbne rettesæt og vælg et rettesæt at uploade til"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Konfigurér avancerede indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Upload til ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Upload ændringer"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Upload de ændrede primitiver"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Indtast en kommentar for dette upload-rettesæt (min 3 tegn)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Ulovlig upload-kommentar"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Omvendt"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Fortsæt"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Klik for at gå tilbage til upload-dialogen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Vis ikke igen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Indtast venligst først en gyldig størrelse for bidderne"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Ulovlig størrelse af bidder"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Annullér uploaden og genoptag redigeringen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9909,109 +9959,11 @@
 msgstr[1] "{0} objekter at slette:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Tilpas linjetegning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Brug globale indstillinger."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Tegn linjer mellem punkter for dette lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Tegn ikke linjer mellem punkter for dette lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Vælg linjetegnings-indstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Tilpas farve"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Vælg en farve"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Markører fra navngivne punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Navngivne punkter fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Importér lyd"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>Dataene i GPX-laget ''{0}'' er blevet downloadet fra serveren."
-"<br>Fordi dets waypoints ikke indeholder et tidsstempel kan vi ikke finde ud "
-"af hvordan de hænger sammen med lyddata.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Import er ikke mulig"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-lydfiler (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Lyd-markører fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importér billeder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html>Dataene i GPX-laget ''{0}'' er blevet downloadet fra serveren."
-"<br>Fordi dets waypoints ikke indeholder et tidsstempel kan vi ikke finde ud "
-"af hvordan de hænger sammen med billeder.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10019,5 +9971,5 @@
 msgstr "Navn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10025,5 +9977,5 @@
 msgstr "Beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10033,23 +9985,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Tidsrum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Længde"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Længde: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10058,5 +10010,5 @@
 msgstr[1] "{0} ruter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10065,10 +10017,10 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Konvertér til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10078,21 +10030,21 @@
 "<br>Hvis du vil uploade traces, så kig her:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Konverteret fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10100,10 +10052,10 @@
 msgstr "Download fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Download alt indenfor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10111,10 +10063,10 @@
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maksimum område per anmodning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10122,21 +10074,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10148,10 +10100,10 @@
 "du<br>at fortsætte?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 "Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10161,5 +10113,5 @@
 "blev udeladt eller flyttet til starten."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10169,23 +10121,121 @@
 "estimere deres tid blev udeladt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Tilpas linjetegning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Brug globale indstillinger."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Tegn linjer mellem punkter for dette lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Tegn ikke linjer mellem punkter for dette lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Vælg linjetegnings-indstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Tilpas farve"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Vælg en farve"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Markører fra navngivne punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Navngivne punkter fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Importér lyd"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>Dataene i GPX-laget ''{0}'' er blevet downloadet fra serveren."
+"<br>Fordi dets waypoints ikke indeholder et tidsstempel kan vi ikke finde ud "
+"af hvordan de hænger sammen med lyddata.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Import er ikke mulig"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-lydfiler (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Lyd-markører fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importér billeder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>Dataene i GPX-laget ''{0}'' er blevet downloadet fra serveren."
+"<br>Fordi dets waypoints ikke indeholder et tidsstempel kan vi ikke finde ud "
+"af hvordan de hænger sammen med billeder.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "Uden for det downloadede område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Advarsel: At blande 0.6 og 0.5 data resulterer i version 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10194,11 +10244,11 @@
 msgstr[1] "Der blev opdaget {0} konflikter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Klik for at lukke denne dialog og fortsætte med at redigere"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10207,36 +10257,36 @@
 msgstr[1] "{0} slettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består af:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "nulstil"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "API-version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Konvertér til GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Datasætskonsistenstest"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "Fandt ingen problemer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Følgende problemer blev fundet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10246,5 +10296,5 @@
 "<br>Hvis du vil uploade traces, så kig her:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10253,5 +10303,5 @@
 msgstr[1] "spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10259,5 +10309,5 @@
 msgstr[1] "punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10266,5 +10316,5 @@
 msgstr[1] "et spor med {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10273,5 +10323,5 @@
 msgstr[1] "{0} består af {1} spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10280,24 +10330,28 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Sammenhold med GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-filer (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Filen {0} er hentet, dog under navnet \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fejl under fortolkning af {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kunne ikke læse \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10309,34 +10363,34 @@
 "vælg en tidszone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Tidspunkt for foto (fra EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "GPS-tidspunkt (aflæst fra ovenstående foto): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/åååå tt:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Jeg er i tidszonen: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Ingen dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Åbn et andet foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synkronisér tiden fra et billede på GPS-modtageren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10346,21 +10400,21 @@
 "Brug venligst det angivne format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Ugyldig dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Intet GPX-spor er indlæst endnu>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX-spor: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Åbn endnu et GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10368,72 +10422,72 @@
 "<html>Brug foto af et nøjagtigt ur,<br>f.eks. GPSmodtagerdisplay</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Automatisk gæt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Manuel justering"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "Underkend position for: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Billeder med geo-lokation i exif-data ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Billeder der allerede er taggede ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Vis miniaturebilleder på kortet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Tidszone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Forskydning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Afstem billeder med GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Sammenhold"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Ugyldig tidszone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Ugyldig forskydning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Prøv igen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "Ingen billeder kunne afstemmes!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "Ingen gpx valgt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10443,20 +10497,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidszone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10465,5 +10519,5 @@
 msgstr[1] "Tidsforskel for {0} dage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10473,21 +10527,21 @@
 "kan justere gliderne for manuelt at afstemme fotoene."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Det lykkedes ikke at matche fotos med spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Justér tidszone og forskydning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "Det valgte billede rummer ingen tidsangivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Billederne rummer ingen tidsangivelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10495,17 +10549,17 @@
 msgstr "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX-sporet har ingen tidsangivelser."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Du bør vælge et GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Intet valgt GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10516,5 +10570,5 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10525,56 +10579,52 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Trækker GPS-lokaliteter ud fra EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Begynder scanning af mappe"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "En af de markerede filer var havde en null-værdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Indlæs billeder..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Indlæser {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kan ikke hente den kanoniske sti for mappen {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tjekker mappen {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fandt en null-fil i mappen {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fejl ved hentning af filer fra mappen {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotaggede billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Sammenhold med GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10583,5 +10633,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10590,10 +10640,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Slet billedfil fra disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10604,5 +10654,5 @@
 "h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "Billedfilen kunne ikke slettes"
@@ -10702,9 +10752,9 @@
 msgstr "JPEG-billeder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPS-markør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10712,5 +10762,5 @@
 msgstr[1] "markører"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10719,9 +10769,21 @@
 msgstr[1] "{0} består af {1} markører"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Ingen eksisterende lydmarkører i dette lag at forskyde ud fra."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Slå synlighed af markørtekst og -ikoner til/fra"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Synkronisér lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10730,5 +10792,5 @@
 "angivelsen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10736,30 +10798,18 @@
 msgstr "Lyd synkroniseret på punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Kan ikke synkronisere i det afspillede lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Sæt audio-markør ved afspilnings-starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr "Du skal pause lyden på det punkt på sporet, hvor du vil have markøren."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Ingen eksisterende lydmarkører i dette lag at forskyde ud fra."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Slå synlighed af markørtekst og -ikoner til/fra"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11664,4 +11714,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Ingen"
@@ -11676,5 +11727,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "Tegn en cirkel udfra HDOP-værdi."
@@ -11777,5 +11828,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Kun relevante retningsvisere (fx ved ensrettede veje)"
@@ -11783,5 +11834,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Kun ved enden af vejen."
@@ -11811,5 +11862,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Forfatter"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Båd"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11818,9 +11883,9 @@
 "Lav automatisk et markørlag udfra ethvert vejpunkt ved åbning af et GPX-lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellem rå GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11830,9 +11895,9 @@
 "for at tegne alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Maksimal længde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11841,10 +11906,10 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Maksimal længde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11853,10 +11918,10 @@
 "information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspile for linjer, som forbinder GPS-punkter."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11864,5 +11929,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11870,13 +11935,13 @@
 msgstr "Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Mindste afstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11885,9 +11950,9 @@
 "Alle punkter og spor-segmenter får samme farve. Kan justeres i laghåndtering."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Farvelægger punkter og spor efter hastighed."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11895,37 +11960,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillader at justere sporfarven for forskellige gennemsnitshastigheder."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Farvelægning af spor og punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "WayPoint billede"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningsvisere på vejstykker"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Tegn ordensnumrene på alle segmenter i deres vej."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Brug udjævning på kortvisningen for et mere glat udseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omridset af data hentet fra serveren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11933,9 +12007,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en anden farve."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -12291,21 +12365,26 @@
 msgstr "Du skal genstarte JOSM for at nogle af ændringerne træder i kraft."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Projektionsmetode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Projektionskode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Vis koordinater som"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Projektionsmetode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Projektionskode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Mål"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Kortprojektion"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12880,5 +12959,5 @@
 msgstr "Tilføj en ny tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12887,49 +12966,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Mere information om denne feature"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Valgfri attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukendt type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12939,15 +13018,15 @@
 msgstr "Kunne ikke læse kilde med fordefinerede tags: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fejl ved fortolkning af {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementer af typen {0} er understøttet."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12957,17 +13036,17 @@
 msgstr[1] "Ret {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Markering uegnet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Anvend fordefinition"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12985,7 +13064,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Søg: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12994,17 +13072,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Søg efter objekter."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Vis lokaliseret navn i markeringslister"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Søg: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13316,5 +13391,5 @@
 msgstr "Fortolkning af fil \"{0}\" fejlede"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument"
@@ -14812,5 +14887,5 @@
 "<br><br>Fejlmeddelelsen er: <br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15088,5 +15163,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Adresse-interpolering"
@@ -15429,41 +15504,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15480,25 +15555,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15536,18 +15611,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Bygninger"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15773,8 +15848,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "vand"
@@ -15835,6 +15910,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "adresse"
@@ -16311,34 +16386,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Tomt lag"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Raster størrelse: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16347,14 +16422,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Mellemlager format fejl"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr "Mellemlager Lambert Zone fejl"
@@ -16434,22 +16509,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Download objekt..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Download kortdata ved enden af den markerede vej"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Download nu"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Vælg mindst én opgave til download"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16459,12 +16530,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Test {0}/{1}: Starter {2}"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Fejl ved fortolkning af {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16495,9 +16566,9 @@
 msgstr "Opret kopi af vej"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -16507,5 +16578,5 @@
 msgstr "RedigérGpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "Ret gpx-spor"
@@ -16514,11 +16585,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Importér rute fra GPX-lag"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Slet eksisterende rute"
@@ -16528,5 +16599,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Intet GPX-datalag blev fundet"
@@ -16536,13 +16607,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16781,5 +16852,5 @@
 msgstr "Vis ikke-geotaggede billeder"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Importerede billeder"
@@ -17131,8 +17202,6 @@
 msgstr "Åbn målevinduet"
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Nulstil"
@@ -17163,5 +17232,5 @@
 msgstr "Vinkel mellem to valgte punkter"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr ""
@@ -17253,5 +17322,5 @@
 msgstr "OpenStreetBugs download-løkke"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Viser OpenStreetBugs sager"
@@ -17322,13 +17391,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17442,93 +17511,93 @@
 msgstr "Firefox-programfil"
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -17570,9 +17639,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17750,20 +17819,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "udredet udgave:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "bekræft alle Fjernbetjenings-handlinger manuelt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "En udvidelse, som tillader JOSM at blive styret fra andre programmer."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Fjernbetjening"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Indstillinger for Fjernbetjeningsudvidelsen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17775,50 +17849,58 @@
 "modulet."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Tilladte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Fjernstyringen er blevet bedt om at indlæse data fra API'et."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Anmod om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Vil du tillade dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Bekræft Fjernbetjenings-handling"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr "Fjernstyring er blevet spurgt om at oprette et nyt punkt."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Fjernstyringen er blevet bedt om at importere data fra følgende URL:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17826,5 +17908,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Tilbagefør"
@@ -18023,41 +18105,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Glidende kort"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Hent tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "Vis info om tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Hent alle tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Øg zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Reducér zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "Ret ind til ternstørrelse"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Tøm tern-mellemlager"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "billede "
@@ -18361,4 +18443,14 @@
 msgid "Terrace"
 msgstr "Rækkehus"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Separator"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19045,6 +19137,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19054,9 +19146,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -19135,6 +19227,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19142,5 +19234,5 @@
 msgstr "Valideringsfejl"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Ingen valideringsfejl"
@@ -19384,32 +19476,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Dublet-punkter"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Dublet-punkter"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Dublet-punkter"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Dublet-punkter"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Dublet-punkter"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Dublet-punkter"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19448,5 +19534,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19978,5 +20064,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "område"
@@ -20115,10 +20201,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -20265,10 +20351,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20471,28 +20557,24 @@
 "Dette kan føre til forkerte koordinater."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automatisk download"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, 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:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(deaktiveret)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-lag ({0}) downloader i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20507,17 +20589,17 @@
 "hente WMS-tern alligevel?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Ja hent billeder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "Ugyldig URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Download synlige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20526,48 +20608,52 @@
 "opløsningen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Skift opløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Genhent fejlagtige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Alpha-kanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Gem WMS-lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Gem WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Indlæs WMS-lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Indlæs WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Fil format fejl"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Fejl ved indlæsning af fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Sæt WMS-bogmærke"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automatisk download"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20646,5 +20732,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20681,5 +20767,5 @@
 msgstr "Lydenheden er utilgængelig"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20701,5 +20787,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "skov"
@@ -20718,71 +20804,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "grænse"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Forøgelse:"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "linie"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Multipolygon"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Netværk"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "Offentlig transport"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Beskrivelse"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "rute"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "sted"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "vandvej"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -21063,7 +21139,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Download fra OSM langs dette spor"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -21284,6 +21359,11 @@
 msgstr "Laver rækkehuse ud af en enkelt blok."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21292,5 +21372,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21299,5 +21379,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21306,10 +21386,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21320,5 +21400,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21328,5 +21408,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21337,15 +21417,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Nem download langs et langt sæt af indbyrdes forbundne veje"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21354,5 +21434,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21485,5 +21565,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Reference"
@@ -22022,5 +22102,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "metal"
@@ -22033,5 +22113,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "træ"
@@ -22335,9 +22415,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "ja"
@@ -22447,9 +22527,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "nej"
@@ -22708,5 +22788,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "beboelse"
@@ -22755,5 +22835,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "service"
@@ -22788,5 +22868,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "konstruktion"
@@ -22873,5 +22953,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "vandring"
@@ -22906,5 +22986,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -23074,14 +23154,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Selskab"
@@ -23349,6 +23429,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Højde"
@@ -23796,5 +23876,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marsk"
@@ -24200,5 +24280,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Spænding"
@@ -24562,31 +24642,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Åbningstider"
@@ -24646,90 +24726,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mandag-Fredag 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24842,7 +24922,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Referensenummer"
@@ -24858,5 +24938,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "underjordisk"
@@ -24869,6 +24949,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Gebyr"
@@ -25044,5 +25124,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "kørestol"
@@ -25079,6 +25159,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Læskur"
@@ -25086,5 +25166,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Bænk"
@@ -25203,5 +25283,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Pejlemærke"
@@ -25362,5 +25442,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Køkken"
@@ -25368,73 +25448,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "græsk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexicansk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Fastfood"
@@ -25442,17 +25527,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Ret fastfood-restaurant"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Café"
@@ -25460,9 +25545,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Ret café"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub"
@@ -25470,18 +25555,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Ret pub"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Ret biergarten"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar"
@@ -25489,9 +25575,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Ret bar"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Natklub"
@@ -25499,24 +25585,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Ret natklub"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Forlystelse"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Ret forlystelse"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museum"
@@ -25524,9 +25610,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Ret museum"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -25535,9 +25621,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Ret zoo"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Udsigtspunkt"
@@ -25545,24 +25631,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Ret udsigtspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Udkigstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Forlystelsespark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Ret forlystelsespark"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Kunstværk"
@@ -25570,5 +25656,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Ret kunstværk"
@@ -25576,19 +25662,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Informationskontor"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -25626,5 +25712,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25632,28 +25718,28 @@
 msgstr "gade"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Vist område"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "sted"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "by"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Nærmere beskrivelse"
@@ -25663,5 +25749,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Ruter vist for:"
@@ -25669,5 +25755,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Vandring"
@@ -25675,6 +25761,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Cykling"
@@ -25682,5 +25768,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -25688,6 +25774,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Skisport"
@@ -25695,5 +25781,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Ridning"
@@ -25701,46 +25787,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "historie"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "dyreliv"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "planter"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Guide post"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "stang"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Informations terminal"
@@ -25748,29 +25842,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Nærmere beskrivelse"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Audio guide"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Audio guide via mobiletelefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Andre informations punkter"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Ret shelter"
@@ -25778,25 +25872,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Bålplads"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Picnic sted"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Ret picnic sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Borg"
@@ -25805,19 +25899,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Ret borg"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Ret ruiner"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Arkæologisk sted"
@@ -25826,9 +25920,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Ret arkæologisk sted"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -25836,10 +25930,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Ret slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Palæontologisk sted"
@@ -25847,5 +25941,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Ret palæontologisk sted"
@@ -25853,15 +25947,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Ret monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Mindesmærke"
@@ -25869,55 +25963,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Ret mindesmærke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Vejkantskors"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Ret vejkantskors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Ret vejkantstempel"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Ret vejkantstempel"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Grænsesten"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Ret grænsesten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Rekreation"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Badeland"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Ret badeland"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Legeplads"
@@ -25925,35 +26019,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Ret legeplads"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Fiskeri"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Ret fiskeri"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Sportsfaciliteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Ret stadion"
@@ -25967,6 +26061,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "vælg sportsgren:"
@@ -26382,31 +26476,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "sport"
@@ -26416,240 +26510,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "bueskydning"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "australsk fodbold"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "petanque"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "hundeløb"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "travbane"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "skydebane"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "skisport"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "fodbold"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "svømning"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Idrætscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Ret idrætscenter"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Væddeløbsbane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Ret væddeløbsbane"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Ret golfbane"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Ret minigolf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Ret multi"
@@ -26691,23 +26785,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "type"
@@ -26749,211 +26843,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "sportshal"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "spor"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Ret bowling"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Ret atletik"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Bueskydning"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Ret bueskydning"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Ret klatring"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Ret kanosport"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Ret cykling"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Hundeløb"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Ret hundeløb"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Ret ridning"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Galopbane"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Ret galopbane"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Ret gymnastik"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Ret motorsport"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Ret skating"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Ret Skateboard"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Svømning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Ret svømning"
@@ -26961,52 +27055,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Ret skisport"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "styrtløb"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "skiløb"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Sværhedsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "nybegynder"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "let"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "avanceret"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Skydning"
@@ -27014,204 +27108,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Ret skydning"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Sport (bold)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Fodbold"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Ret fodbold"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Australsk fodbold"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Ret australsk fodbold"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Ret Baseball"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Ret Basketball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Ret Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "Golfbane"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Petanque"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Ret petanque"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Ret cricket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Cricketnet"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Ret cricketnet"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Ret kroket"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Ret hockey"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Ret pelota"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Ret bordtennis"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Ret tennis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Menneskeskabt"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Bygning"
@@ -27219,5 +27313,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -27225,10 +27319,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Ret offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Rådhus"
@@ -27236,10 +27330,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Ret rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Ambassade"
@@ -27247,10 +27341,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Ret ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Domhus"
@@ -27259,10 +27353,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Ret domhus"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Fængsel"
@@ -27271,10 +27365,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Ret fængsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Politi"
@@ -27284,10 +27378,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Ret politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -27296,10 +27390,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Ret brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Posthus"
@@ -27307,5 +27401,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Ret posthus"
@@ -27313,15 +27407,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Ret børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Skole"
@@ -27329,10 +27423,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Ret skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Universitet"
@@ -27340,10 +27434,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Ret universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Videregående udd."
@@ -27351,5 +27445,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Ret videregående udd."
@@ -27357,5 +27451,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Biograf"
@@ -27364,10 +27458,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Ret biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Bibliotek"
@@ -27376,9 +27470,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Ret bibliotek"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Kunstcenter"
@@ -27386,10 +27480,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Ret kunstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Teater"
@@ -27398,10 +27492,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Ret teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Sted for tilbedelse"
@@ -27411,5 +27505,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Ret sted for tilbedelse"
@@ -27418,6 +27512,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religion"
@@ -27426,66 +27520,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "buddhistisk"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hinduistisk"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jainistisk"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "muslimsk"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "spiritistisk"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoistisk"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "unitar"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastristisk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Trosretning"
@@ -27494,81 +27588,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptistisk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "Jehovas Vidner"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "metodistisk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormonsk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pinsebevægelsen"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "prebyteriansk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestantisk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "kvæker"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "shiitisk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunnitisk"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Adresser"
@@ -27577,5 +27671,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Ret adresseinformation"
@@ -27583,5 +27677,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Husnummer"
@@ -27589,25 +27683,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Vejnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Bynavn"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Landekode"
@@ -27616,5 +27710,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Ret adresse-interpolering"
@@ -27622,61 +27716,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Nummereringssystem"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "ulige"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "lige"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Menneskeskabt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Ret fabrik"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Ret tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Type af tårn"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "kommunikation"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Højde (meter)"
@@ -27684,25 +27778,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Vandtårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Ret vandtårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gasbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Ret gasbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -27710,10 +27804,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Ret fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Vejrmølle"
@@ -27721,10 +27815,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Ret vejrmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -27733,41 +27827,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Ret rørledning"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "varme"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "olie"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "Spildevand"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Sted"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "undervands"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "på land"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Rensningsanlæg"
@@ -27777,10 +27871,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Ret rensningsanlæg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Kran"
@@ -27788,5 +27882,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Ret kran"
@@ -27794,10 +27888,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Ret Pejlemærke"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Målepunkt"
@@ -27805,10 +27899,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Ret målepunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Overvågning"
@@ -27816,23 +27910,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Ret overvågningskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Generator"
@@ -27842,35 +27936,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Ret generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "vand"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "arom"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "kul"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "sol"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Kraftværk"
@@ -27879,10 +27973,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Ret kraftværk"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -27891,5 +27985,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Ret transformatorstation"
@@ -27897,10 +27991,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Linie reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Elmast"
@@ -27911,23 +28005,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Ret elmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "tårn"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "stang"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Tårn reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Strømkabel"
@@ -27936,78 +28030,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Ret strømkabel"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Linie type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "linie"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "motorvejsforbindelse"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Antal kabler"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "enkelt"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "dobbelt"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "tredobbelt"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "firdobbelt"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Faciliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Toiletter"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefon"
@@ -28016,5 +28108,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Ret telefon"
@@ -28022,5 +28114,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Mønter"
@@ -28028,5 +28120,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Sedler"
@@ -28034,5 +28126,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Elektroniske punge og betalingskort"
@@ -28040,5 +28132,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Kreditkort"
@@ -28046,15 +28138,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Genbrug"
@@ -28063,5 +28155,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Ret genbrugsplads"
@@ -28069,35 +28161,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Dåser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Tøj"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Skrotjern"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -28105,5 +28197,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28112,31 +28204,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "sten"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plastik"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Farve"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "sort"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "brun"
@@ -28215,39 +28307,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "grøn"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "rød"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "blå"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "grå"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "hvid"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Antal sæder"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Skydetelt"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Ret skydetelt"
@@ -28256,30 +28348,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Højde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "fuld"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Springvand"
@@ -28288,10 +28380,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Ret springvand"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Vandpost"
@@ -28300,10 +28392,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Ret vandpost"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -28312,5 +28404,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28318,5 +28410,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Babyluge"
@@ -28324,15 +28416,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Ret babyluge"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Bilforhandler"
@@ -28340,10 +28432,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Ret bilforhandler"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Cykelhandler"
@@ -28352,28 +28444,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Ret cykelhandler"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Ret supermarked"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Købmand"
@@ -28381,9 +28473,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Ret købmand"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -28391,27 +28483,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Ret kiosk"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Boghandler"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Ret boghandler"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Rejsebureau"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Ret rejsebureau"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Slagter"
@@ -28419,9 +28511,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Ret slagter"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Bager"
@@ -28429,9 +28521,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Ret bager"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Blomsterhandler"
@@ -28439,18 +28531,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Ret blomsterhandler"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Ret økologisk forretning"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Sprit"
@@ -28458,54 +28550,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Ret spritbutik"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Drikkevarer"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Ret drikkevarebutik"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Ret computerforretning"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Elektronik"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Ret elektronikforretning"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hi-fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Ret hi-fi-forhandler"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Møbelforretning"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Ret møbelforretning"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Havecenter"
@@ -28513,9 +28605,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Ret havecenter"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Isenkræmmer"
@@ -28523,9 +28615,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Ret isenkræmmer"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Gør-det-selv-butik"
@@ -28533,54 +28625,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Ret gør-det-selv-butik"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Ret frisør"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Sko"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Ret skobutik"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Legetøjsbutik"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Ret legetøjsbutik"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Ret videobutik"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Kemisk renseri"
@@ -28588,9 +28680,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Ret kemisk renseri"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -28598,9 +28690,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Ret vaskeri"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr ""
@@ -28608,24 +28700,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Ret sportsbutik"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Ret optiker"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Automat"
@@ -28633,5 +28725,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Ret automat"
@@ -28639,97 +28731,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Varer i automat"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "P-automat"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "mad"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "slik"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "billeder"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "dyremad"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "legetøj"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "frimærker"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tamponer"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "høm-høm-pose"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Penge"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Bank"
@@ -28737,14 +28829,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Ret bank"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Pengeautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Vekselkontor"
@@ -28752,5 +28844,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Ret vekselkontor"
@@ -28758,15 +28850,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Ret pengeautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Sundhed"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Lægehus"
@@ -28774,18 +28866,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Ret lægehus"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Tandlæge"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Ret tandlæge"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -28793,5 +28885,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Ret apotek"
@@ -28799,9 +28891,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Håndkøb"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Hospital"
@@ -28809,10 +28901,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Ret Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr ""
@@ -28821,5 +28913,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28828,20 +28920,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(brug forvalgskode, fx +12-345-67890)"
@@ -28849,5 +28941,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Dyrlæge"
@@ -28856,64 +28948,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Ret dyrlæge"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Steder"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Ret et kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Ret land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Stat"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Ret stat"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Ret region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Amt"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Ret amt"
@@ -28921,15 +29013,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Storby"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Ret storby"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "By"
@@ -28937,10 +29029,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Ret By"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Forstad"
@@ -28948,25 +29040,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Ret forstad"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Mindre by"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Ret mindre by"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Landsby"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Ret landsby"
@@ -28974,5 +29066,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Egn"
@@ -28980,10 +29072,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Ret lokalitet"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Ø"
@@ -28991,10 +29083,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Ret ø"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -29002,5 +29094,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -29008,5 +29100,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Huleindgang"
@@ -29014,10 +29106,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Ret huleindgang"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Tinde"
@@ -29025,10 +29117,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Ret tinde"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -29036,10 +29128,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Ret gletsjer"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Vulkan"
@@ -29047,70 +29139,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Ret vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Grænser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Ret landegrænser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administrativt"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Ret administrativ grænse"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Ret civil-grænse"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Ret politisk grænse"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Ret grænser for nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Brug af land"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Træ"
@@ -29119,15 +29211,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Ret et træ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Naturskov"
@@ -29136,5 +29228,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Ret naturskov"
@@ -29142,17 +29234,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "Nåleskov"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "Løvskov"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "blandet"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Skov"
@@ -29161,14 +29253,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Ret skovområde"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Ret naturreservat"
@@ -29176,25 +29268,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Ur"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Ret ur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Krat"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Ret krat"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Fjeldområde"
@@ -29202,10 +29294,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Ret fjeldområde"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Hede"
@@ -29213,5 +29305,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Ret hede"
@@ -29219,5 +29311,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Gårdsplads"
@@ -29226,45 +29318,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Ret gårdsplads"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Jordbrugsland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Ret landbrugsland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Ret vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Kolonihaver"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Ret kolonihave-område"
@@ -29272,25 +29364,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Have"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Ret have"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Græs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -29298,10 +29390,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr ""
@@ -29309,20 +29401,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Ret park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Rekreativt område"
@@ -29330,5 +29422,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Ret rekreativt område"
@@ -29336,15 +29428,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Beboelseområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Gravplads"
@@ -29352,9 +29444,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Ret gravplads"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -29362,39 +29454,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Detailhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Ret område for detailhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industri"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Ret industri-område"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr ""
@@ -29402,15 +29494,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Militært område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Ret militært område"
@@ -29418,50 +29510,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Byggeplads"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Ret område for byggeplads"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Losseplads"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Ret losseplads"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Stenbrud"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Ret stenbrudsområde"
@@ -29471,5 +29563,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Ret multipolygon"
@@ -29481,5 +29573,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "ydre segment"
@@ -29487,5 +29579,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "indre segment"
@@ -29493,5 +29585,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -29502,5 +29594,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -29508,36 +29600,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29545,5 +29637,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr ""
@@ -29552,5 +29644,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29558,34 +29650,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "ingen_venstre_sving"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "ingen_højre_sving"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "ingen_lige_ud"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "ingen_u_vendinger"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "kun_højre_sving"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "kun_venstre_sving"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "kun_lige_ud"
@@ -29594,15 +29686,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "fra vej"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "til vej"
@@ -29610,5 +29702,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Rute"
@@ -29617,5 +29709,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Ret rute"
@@ -29623,5 +29715,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Rutetype"
@@ -29729,5 +29821,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29738,17 +29830,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "vej"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "færge"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "ski"
@@ -29816,5 +29908,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29824,9 +29916,9 @@
 msgstr "fod"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "sporvogn"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "omvej"
@@ -29840,10 +29932,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "undergrundsbane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Symbol beskrivelse"
@@ -29851,31 +29943,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Netværk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "foreslået"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "skiftende"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Farve (hex)"
@@ -29884,30 +29976,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "rute-segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -30134,5 +30226,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr ""
@@ -30785,4 +30877,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30886,11 +30986,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "menneskeskabt"
@@ -31403,5 +31503,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "mole"
@@ -31415,5 +31515,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "rørledning"
@@ -31557,13 +31657,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "rekreation"
@@ -31577,5 +31677,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "marina"
@@ -31671,10 +31771,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr ""
@@ -31776,10 +31876,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -32217,24 +32317,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -32266,6 +32366,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -32326,8 +32426,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "helbred"
@@ -32680,26 +32780,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "butik"
@@ -32771,8 +32871,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -32873,9 +32973,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turisme"
@@ -32963,9 +33063,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "historisk"
@@ -32978,5 +33078,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "stenbrud"
@@ -32990,5 +33090,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "losseplads"
@@ -33010,5 +33110,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "basin"
@@ -33022,5 +33122,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "gårdsplads"
@@ -33043,5 +33143,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr ""
@@ -33055,5 +33155,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "industri"
@@ -33067,5 +33167,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr ""
@@ -33079,5 +33179,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr ""
@@ -33091,5 +33191,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr ""
@@ -33146,7 +33246,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "militær"
@@ -33160,5 +33260,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "kirkegård"
@@ -33171,5 +33271,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "top"
@@ -33184,5 +33284,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "gletsjer"
@@ -33196,5 +33296,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "vulkan"
@@ -33249,8 +33349,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr ""
@@ -33264,5 +33364,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "buskads"
@@ -33276,5 +33376,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "hede"
@@ -33288,5 +33388,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -33300,5 +33400,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr ""
@@ -33312,5 +33412,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "strand"
@@ -33388,8 +33488,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "rute"
@@ -33478,12 +33578,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "grænse"
@@ -33633,11 +33733,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "sted"
@@ -33651,5 +33751,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -34005,6 +34105,17 @@
 msgstr "Sicilen - Italien"
 
-#~ msgid "closedway"
-#~ msgstr "lukketvej"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Den valgte vej indeholder ikke det valgte punkt."
+#~ msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Grader minutter sekunder"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Indtast en upload-kommentar (min. 3 tegn)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "Indtast en kommentar for dette upload-rettesæt (min 3 tegn)"
 
 #~ msgid "Move"
@@ -34013,7 +34124,4 @@
 #~ msgid "No data imported."
 #~ msgstr "Intet data importeret."
-
-#~ msgid "Do not show again"
-#~ msgstr "Vis ikke igen"
 
 #~ msgid "Please report a ticket at {0}"
@@ -34213,7 +34321,4 @@
 #~ msgstr "Fejl ved fortolkning"
 
-#~ msgid "resolved version:"
-#~ msgstr "udredet udgave:"
-
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -34329,7 +34434,4 @@
 #~ msgid "osmarender options"
 #~ msgstr "osmarender-indstillinger"
-
-#~ msgid "Boat"
-#~ msgstr "Båd"
 
 #~ msgid "Motorboat"
@@ -35347,4 +35449,7 @@
 #~ msgstr "Åbn"
 
+#~ msgid "closedway"
+#~ msgstr "lukketvej"
+
 #~ msgid "<multiple>"
 #~ msgstr "<flere>"
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 22568)
+++ applications/editors/josm/i18n/po/de.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-12 14:23+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-08-04 16:49+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-07-28 09:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -232,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -246,5 +245,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -264,11 +263,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -276,20 +276,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -324,5 +324,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Vereinen"
@@ -392,5 +392,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -404,5 +404,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -424,4 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -438,6 +439,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -449,5 +450,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -582,22 +583,22 @@
 msgstr "Offene Änderungssätze herunterladen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Weg verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Mehrere Wege zu einem verbinden."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Richtungen ändern?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Drehen und Verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -607,5 +608,5 @@
 "Sollen einige Richtungen gedreht werden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -615,10 +616,10 @@
 "Reihenfolge gebracht werden)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} Wege verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden."
@@ -665,10 +666,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -806,5 +807,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -870,10 +871,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Als GPX exportieren..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Die Daten ins GPX-Format exportieren."
@@ -1067,5 +1068,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1501,20 +1502,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1538,5 +1539,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1547,6 +1548,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Fehler"
@@ -1573,5 +1574,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1579,5 +1580,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Aktuelle Daten speichern."
@@ -1634,10 +1635,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Speichern unter..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Aktuelle Daten in einer neuen Datei speichern."
@@ -1683,5 +1684,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1708,5 +1709,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Nein, abbrechen"
@@ -1775,18 +1776,24 @@
 msgstr[1] "Weg vereinfachen ({0} Knoten entfernen)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Weg aufspalten"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Weg am gewählten Knoten aufspalten."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Die aktuelle Auswahl kann nicht zum Aufspalten verwendet werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Die gewählten Knoten gehören nicht zum selben Weg."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1794,5 +1801,5 @@
 msgstr[1] "Die gewählten Knoten sind nicht Teil eines Weges."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1808,16 +1815,6 @@
 "auch den Weg auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Die gewählten Knoten gehören nicht zum selben Weg."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Der gewählte Weg enthält nicht den gewählten Knoten."
-msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Knoten."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
@@ -1825,5 +1822,5 @@
 "trennen zu können."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1833,5 +1830,5 @@
 "in der Mitte des Weges.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1841,5 +1838,5 @@
 "kopiert.<br>Sie sollten dies überprüfen und falls nötig korrigieren.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1849,5 +1846,5 @@
 "<br>Sie sollten dies überprüfen und falls nötig korrigieren.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2002,5 +1999,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3049,22 +3046,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3211,6 +3208,6 @@
 msgstr "Kann unentschiedenen Konflikt nicht auflösen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
@@ -3218,20 +3215,20 @@
 "Menge erhalten"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Knoten {0} löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Weg {0} löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Relation {0} löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3240,5 +3237,5 @@
 msgstr[1] "{0} Objekte löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3247,5 +3244,5 @@
 msgstr[1] "{0} Knoten löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3254,5 +3251,5 @@
 msgstr[1] "{0} Wege löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3261,5 +3258,5 @@
 msgstr[1] "{0} Relationen löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3417,5 +3414,5 @@
 msgstr "Anwenden?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3483,4 +3480,6 @@
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
+"Verzeichnis {0} konnte nicht erstellt werden, Automatische Sicherungen "
+"wurden deaktiviert."
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
@@ -3488,19 +3487,23 @@
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
+"Dateiname {0} konnte nicht benutzt werden, ein anderer Dateiname wird "
+"verwendet."
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n"
+msgstr ""
+"Ein-/Ausgabefehler beim speichern der Datei. Automatische Sicherungen "
+"deaktiviert: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Alte Sicherungsdateien überschreiben?"
+msgstr "Fehler bei Löschung der alten Backup-Datei {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Fehler beim Erstellen des Speichers: {0}"
+msgstr "Fehler bei der Erstellung des entfernten Layers: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3508,4 +3511,5 @@
 msgid "Unable to read autosaved osm data ({0}) - {1}"
 msgstr ""
+"Lesen von automatisch gespeicherten osm-Daten nicht möglich ({0}) - {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
@@ -3699,42 +3703,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Grad Minuten Sekunden"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Projizierte Koordinaten"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "W"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3744,5 +3751,5 @@
 "enthalten ist"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3934,5 +3941,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "Hintergrund"
@@ -4080,5 +4087,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Nicht noch einmal zeigen (speichert Auswahl)"
@@ -4106,5 +4113,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "Eisenbahn"
@@ -4126,6 +4133,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4194,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "Gebäude"
@@ -4279,5 +4286,5 @@
 msgstr "Objekt gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4382,70 +4389,70 @@
 msgstr "Passwort"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "Verwendung"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "Optionen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Diese Hilfe anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Bounding Box herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Herunterladen der Position aus der URL (mit lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Eine Datei öffnen (jeder Dateityp, welcher von Datei/Öffnen unterstützt wird)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Bounding Box als GPS-Spuren herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "GPS-Daten am Ort der URL (mit lat=x&lon=y&zoom=z) herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Mit der angegebenen Suche auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Mit maximiertem Fenster starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Standardwerte zurücksetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Sprache einstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "Optionen über die Java-Systemeinstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PFAD/ZU/JOSM/ORDNER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Verzeichnis für alle Benutzereinstellungen ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4459,9 +4466,9 @@
 "festgelegt werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "Beispiele"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4471,47 +4478,46 @@
 "Reihenfolge verarbeitet."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 "Stellen Sie sicher, dass sie Daten laden, falls Sie --selection verwenden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Plugins aktualisieren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Aktualisierte Plugins installieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Zeitige Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Voreinstellungen setzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Hauptfenster erzeugen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+msgstr "Nicht gespeicherte osm-Daten"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Auflösen"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr "Wiederherstellen"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4519,6 +4525,8 @@
 "time. Do you want to restore data?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+"JOSM hat {0} ungespeicherte osm-Datenlayer gefunden. Es scheint als ist JOSM "
+"zuletzt abgestürzt. Wollen sie die Daten wiederherstellen?"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4614,33 +4622,33 @@
 msgstr "Herauszoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "Skala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Die geographische Länge an der Mausposition."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Der Name des Objekts unter der Mausposition."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Die geographische Breite an der Mausposition."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Der Winkel zwischen vorherigem und aktuellem Wegabschnitt."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Die (Kompass-)Richtung des zu zeichnenden Wegabschnittes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Die Länge des neu zu zeichnenden Wegabschnittes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4650,9 +4658,9 @@
 "halten, um mit der Maus aus der Liste zu wählen.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(kein Objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4668,4 +4676,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Ebene ''{0}'' muss in der Liste der Ebenen sein"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Numerisch"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "chinesisch"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Gewerbegebiet"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5422,5 +5445,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "alle"
@@ -5504,6 +5527,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5514,5 +5537,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5667,5 +5690,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Änderungssätze"
@@ -5730,5 +5753,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5896,5 +5919,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5902,5 +5925,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5908,5 +5931,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5914,5 +5937,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5920,5 +5943,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5927,5 +5950,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5933,5 +5956,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5939,5 +5962,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5945,24 +5968,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filter aktiv</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> Objekte versteckt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> Objekte ausgeblendet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Den Filterdialog schließen, um alle Objekte zu sehen<p></html>"
@@ -6042,51 +6065,51 @@
 msgstr "Dialog schließen, keinen neuen Knoten anlegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Ebenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Liste aller geladenen Ebenen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Ausgewählte Ebenen löschen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Sichtbarkeit der Ebene umschalten."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Anzeigen/Ausblenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Sichtbarkeit der Ebene umschalten."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Die ausgewählte Ebene aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Aktuelle Ebene mit einer anderen Ebene verbinden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Diese Ebene duplizieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Gewählte Ebene eine Zeile nach oben verschieben."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Gewählte Ebene eine Zeile nach unten verschieben."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Ebeneninformation"
@@ -6096,5 +6119,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relationen"
@@ -7267,6 +7290,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7314,107 +7338,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Name"
@@ -7795,5 +7819,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7884,5 +7908,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<unterschiedlich>"
@@ -8382,4 +8406,6 @@
 "current layer"
 msgstr ""
+"Elemente aus der Zwischenablage können nicht gefügt werden, da sie nicht "
+"Teil des aktuellen Layers sind."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
@@ -8662,5 +8688,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Grenzen"
@@ -8733,8 +8759,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Typ"
@@ -8763,6 +8789,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "unbekannt"
@@ -9124,5 +9150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Konflikte gefunden"
@@ -9197,15 +9223,15 @@
 "überein"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Ein kurzer Kommentar über die hochzuladenden Änderungen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
-"Bitte einen Kommentar für den Änderungssatz eingeben. (mind. 3 Zeichen)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Ungültiger Kommentar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "Änderungssatz-Nummer:"
@@ -9687,5 +9713,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Hochladen"
@@ -9707,5 +9733,5 @@
 msgstr "Initialisiere Relationen zum Aktualisieren ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9713,5 +9739,5 @@
 msgstr "Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
@@ -9719,14 +9745,14 @@
 "Änderungssatz verwendet wird"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Merkmale des neuen Änderungssatzes"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Merkmale im Änderungssatz nutzen, zu dem hochgeladen wird"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
@@ -9734,44 +9760,77 @@
 "hinzugefügt werden"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Erweiterte Einstellungen konfigurieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Zu ''{0}'' hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Änderungen hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Geänderte Objekte hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-"Bitte geben Sie einen Kommentar für den Änderungssatz ein (mind. 3 Zeichen)."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Ungültiger Kommentar"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Umkehren"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Fortfahren"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Abbrechen und zum Editor zurückkehren"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Nicht noch einmal zeigen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Bitte geben Sie zuerst eine zulässige Blockgröße an."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Ungültge Blockgröße"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Hochladen abbrechend und Bearbeitung fortsetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -10139,109 +10198,11 @@
 msgstr[1] "{0} zu löschende Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "GPS-Punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Linienaussehen anpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Globale Einstellungen verwenden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Linienaussehen wählen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Farben anpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Voreinstellung"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Farbe auswählen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Marken von benannten Punkten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Benannte GPS-Punkte von {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Audio importieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>Die Daten in der GPS-Ebene ''{0}'' wurden vom Server heruntergeladen."
-"<br>Da die Wegpunkte keine Zeitstempel enthalten, können sie auch nicht mit "
-"Audiodaten verknüpft werden.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Import nicht möglich"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Audio-Dateien im Wave-Format (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Audio-Marken von {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Bilder importieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html>Die Daten in der GPX-Ebene ''{0}'' wurden vom Server heruntergeladen."
-"<br>Da die Wegpunkte keine Zeitstempel enthalten, können sie auch nicht mit "
-"Bildern verknüpft werden.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10249,5 +10210,5 @@
 msgstr "Name: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10255,5 +10216,5 @@
 msgstr "Beschreibung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10263,23 +10224,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Zeitraum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Länge: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10288,5 +10249,5 @@
 msgstr[1] "{0} Routen, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10295,10 +10256,10 @@
 msgstr[1] "{0} Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10308,21 +10269,21 @@
 "<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Konvertiert von: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10330,10 +10291,10 @@
 msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Alles im Bereich herunterladen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10341,10 +10302,10 @@
 msgstr "{0} Meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximalgebiet je Anfrage:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10352,21 +10313,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr "Herunterladen nahe bei:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr "nur Weg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr "nur Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr "Weg und Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10378,5 +10339,5 @@
 "fortfahren?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -10384,5 +10345,5 @@
 "werden kann."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10392,5 +10353,5 @@
 "wurden ignoriert oder an den Anfang verschoben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10400,24 +10361,122 @@
 "der GPS-Spur entfernt waren, wurden ignoriert."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Linienaussehen anpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Globale Einstellungen verwenden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Linienaussehen wählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Farben anpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Voreinstellung"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Farbe auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Marken von benannten Punkten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Benannte GPS-Punkte von {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Audio importieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>Die Daten in der GPS-Ebene ''{0}'' wurden vom Server heruntergeladen."
+"<br>Da die Wegpunkte keine Zeitstempel enthalten, können sie auch nicht mit "
+"Audiodaten verknüpft werden.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Import nicht möglich"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Audio-Dateien im Wave-Format (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Audio-Marken von {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Bilder importieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>Die Daten in der GPX-Ebene ''{0}'' wurden vom Server heruntergeladen."
+"<br>Da die Wegpunkte keine Zeitstempel enthalten, können sie auch nicht mit "
+"Bildern verknüpft werden.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datenebene {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "Außerhalb des heruntergeladenen Bereichs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 "Warnung: Das Vermischen von 0.6- und 0.5-Daten resultiert in Version 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10426,11 +10485,11 @@
 msgstr[1] "{0} Konflikte wurden entdeckt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Diesen Dialog schließen und Bearbeitung fortsetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10439,36 +10498,36 @@
 msgstr[1] "{0} gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} besteht aus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "nicht angegeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "API-Version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Zu GPX-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Datensatzkonsistenzprüfung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "Keine Probleme gefunden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Folgende Probleme gefunden:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10478,5 +10537,5 @@
 "<br>Informationen zum Hochladen von Tracks finden Sie hier:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10485,5 +10544,5 @@
 msgstr[1] "GPS-Spuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10491,5 +10550,5 @@
 msgstr[1] "Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10498,5 +10557,5 @@
 msgstr[1] "Eine GPS-Spur mit {0} Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10505,5 +10564,5 @@
 msgstr[1] "{0} besteht aus {1} GPS-Spuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10512,24 +10571,28 @@
 msgstr[1] "{0} Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Mit GPX korrelieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-Dateien (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Datei {0} ist unter dem Namen \"{1}\" bereits geladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fehler beim Einlesen von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kann \"{0}\" nicht lesen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10541,34 +10604,34 @@
 "dem Foto und wählen eine Zeitzone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Fotozeit (aus EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "GPS-Zeit (aus obigem Photo): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Ich bin in der Zeitzone von: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Kein Datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Ein anderes Foto öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Zeit von Foto und GPS-Empfänger synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10578,21 +10641,21 @@
 "Bitte verwenden Sie das geforderte Format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Ungültiges Datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Bisher keine GPS-Daten geladen>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPS-Spur: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Eine andere GPS-Spur laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10601,72 +10664,72 @@
 "Empfängers</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Automatisch ermitteln"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr "Ordnet das erste Foto dem ersten GPS-Punkt zu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Manuell justieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "Position überschreiben für: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Fotos mit Ortsinformationen in EXIF-Daten ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Bilder die bereits markiert sind ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Vorschaubilder auf der Karte anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Zeitzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Bilder mit GPS-Spur korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Ungültige Zeitzone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Ungültiger Offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Erneut versuchen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "Es gibt keine passenden Bilder!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "Keine GPS-Spur ausgewählt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10677,20 +10740,20 @@
 "<html><b>{0}</b> von <b>{1}</b> Bildern an GPS-Spur angepaßt.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Zeitzone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10699,5 +10762,5 @@
 msgstr[1] "(Zeitunterschied von {0} Tagen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10708,21 +10771,21 @@
 "synchonisieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Zeitzone und Offset anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "Die gewählten Bilder enthalten keine Zeitinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Bilder enthalten keine Zeitinformation"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10732,17 +10795,17 @@
 "andere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPS-Spur enthält keine Zeitinformationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Wählen Sie eine GPS-Spur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Keine GPS-Spur gewählt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10753,5 +10816,5 @@
 "Erwartetes Format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10762,56 +10825,52 @@
 "Erwartetes Format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-Positionen aus EXIF-Daten extrahieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Verzeichnisuntersuchen starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "Eine der ausgewählten Dateien war nicht vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Photos lesen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Einlesen {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kann generischen Pfad für Verzeichnis{0} nicht bestimmen\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Verzeichnis {0} untersuchen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Leere Datei im Verzeichnis {0} gefunden\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Georeferenzierte Bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Mit GPX korrelieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10820,5 +10879,5 @@
 msgstr[1] "{0} Bilder geladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10827,10 +10886,10 @@
 msgstr[1] "{0} wurden als GPS-markiert erkannt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Bilddatei von der Platte löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10841,5 +10900,5 @@
 "</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "Bilddatei konnte nicht gelöscht werden."
@@ -10941,9 +11000,9 @@
 msgstr "JPEG-Bilder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPS-Markierung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10951,5 +11010,5 @@
 msgstr[1] "Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10958,9 +11017,23 @@
 msgstr[1] "{0} besteht aus {1} Wegpunkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"Keine bestehenden Audio-Marken in dieser Ebene gefunden, von denen der "
+"Offset abgeleitet werden könnte."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "Zeige Text/Symbole"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Sichtbarkeit von Textmarken und Symbolen umschalten."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Ton synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10969,5 +11042,5 @@
 "Synchronisationston hören."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10975,14 +11048,14 @@
 msgstr "Ton synchronisiert bei Punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Sychronisation in Abspielebene nicht möglich."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Audio-Marke an der aktuellen Abspielposition einfügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10991,18 +11064,4 @@
 "Sie müssen die Tonwiedergabe an der Stelle der GPS-Spur pausieren, an der "
 "die Marke eingefügt werden soll."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"Keine bestehenden Audio-Marken in dieser Ebene gefunden, von denen der "
-"Offset abgeleitet werden könnte."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr "Zeige Text/Symbole"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Sichtbarkeit von Textmarken und Symbolen umschalten."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11971,4 +12030,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Keine"
@@ -11983,5 +12043,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "Kreisförmig die Genauigkeit des GPS-Signals (HDOP) anzeigen"
@@ -12085,5 +12145,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Nur interessante Richtungspfeile (z.B. bei Einbahnstraßen)"
@@ -12091,5 +12151,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Nur am Ende des Weges"
@@ -12119,5 +12179,20 @@
 msgstr "Marken beim Einlesen von GPX erstellen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Autor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Diesel"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Nord"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12127,9 +12202,9 @@
 "geöffnet wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Linien zwischen GPS-Rohdatenpunkten zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12139,9 +12214,9 @@
 "\"-1\", um alle Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Maximallänge für lokale Dateien (Meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12150,10 +12225,10 @@
 "Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Maximallänge (Meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12162,10 +12237,10 @@
 "Informationen enthalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtungspfeile an Linien zwischen GPS-Punkten zeichnen."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12174,5 +12249,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12181,13 +12256,13 @@
 "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Mindestabstand (Pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Größere Punkte für GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12197,9 +12272,9 @@
 "Ebenenübersicht angepasst werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Punkte und GPS-Spuren nach Geschwindigkeit einfärben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12209,5 +12284,5 @@
 "Ihr GPS-Empfänger muss diese Information aufzeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12215,23 +12290,32 @@
 "Durchschnittsgeschwindigkeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Färbung von GPS-Spuren und Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "Wegpunktbeschreibung"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS-Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Richtungspfeile für Wegabschnitte zeichnen."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Ordnungsnummer für alle Abschnitte innerhalb des Weges anzeigen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -12240,10 +12324,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Grenze des vom OSM-Server geladenen Bereichs anzeigen."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12252,9 +12336,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Inaktive Datenebenen in einer anderen Farbe zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM-Daten"
@@ -12643,21 +12727,26 @@
 msgstr "Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Projektionsmethode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Projektionsbezeichnung"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Koordinaten anzeigen als"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Projektionsmethode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Projektionsbezeichnung"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Ebene für Messungen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Projektionsmethode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -13272,5 +13361,5 @@
 msgstr "Neues Merkmal hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -13281,49 +13370,49 @@
 "''display_values'' muss mit der Anzahl in ''values'' identisch sein."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Mehr Informationen zu dieser Vorlage"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Unbekannte Vorraussetzung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "Verfügbare Rollen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr "Rolle"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr "Anzahl"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr "Elemente"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Optionale Attribute:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unbekannter Typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr "Vorlagenelement Rolle ohne Vorgänger"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr "Vorlagenelement ohne Elternelement"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13333,15 +13422,15 @@
 msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fehler beim Einlesen von {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente des Typs {0} werden unterstützt."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13351,17 +13440,17 @@
 msgstr[1] "Ändere {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Nichts ausgewählt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Auswahl unpassend!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Vorlage anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13379,26 +13468,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Suche: "
+msgstr "Such-Voreinstellung"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Show preset search dialog"
-msgstr ""
+msgstr "Zeige Voreinstellungs-Suchdialog"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Nach Objekten suchen"
+msgstr "Such-Voreinstellungen"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Übersetzten Namen in Auswahllisten anzeigen"
+msgstr "Nur Einträge passend zur Auswahl zeigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Suche: "
+msgstr "Suche in Merkmalen"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13729,5 +13814,5 @@
 msgstr "Fehler beim Einlesen von Datei \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument"
@@ -15364,5 +15449,5 @@
 "<br><br>Die Fehlermeldung lautet:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15663,5 +15748,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -16092,41 +16177,41 @@
 msgstr "Nicht noch einmal zeigen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "Adresse des Gebäudes"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "Hausnummer:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Straße:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Erhöhen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Reduzieren"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Hausnummern:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr "Modeus Große Gebäude"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr "Fadenkreuz rotieren"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr "Erweiterte Einstellungen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr "Gebäudemerkmal:"
@@ -16144,25 +16229,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Größe des Gebäudes festlegen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "Adressdialog nutzen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr "Gebäude automatisch wählen."
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Breite des Gebäudes:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr "Schrittweite:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr "Erweiter..."
@@ -16200,18 +16285,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Gebäude"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr "Nächste Nummer"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Straße"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr "Adressen eingeben"
@@ -16390,5 +16475,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
 msgid "Use \"Tableau d''assemblage\""
-msgstr ""
+msgstr "Nutze \"Tableau d''assemblage\""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -16453,8 +16538,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "Wasser"
@@ -16515,6 +16600,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "Adresse"
@@ -16706,4 +16791,6 @@
 "Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
+"Das \"Tableau(x) d'assemblage\" in die Liste der zu holenden Katasterseiten "
+"aufnehmen."
 
 #. the crosspiece display
@@ -17023,34 +17110,34 @@
 "Bitte eine auswählen und erneut versuchen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Leere Ebene"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-Ebene ({0}), {1} Kachel(n) geladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Ist nicht vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Rastergröße: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "Ist vektorisiert."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Kommunen-Koordinatenfenster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -17062,9 +17149,9 @@
 "Erzeuge eine neue Datei."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Zwischenspeicher-Formatfehler"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -17073,5 +17160,5 @@
 "inkompatibel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 msgid "Cache Lambert Zone Error"
 msgstr "Lambert-Zonenfehler zwischenspeichern"
@@ -17151,39 +17238,34 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Objekt herunterladen..."
+msgstr "Herunterladen entlang..."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Kartendaten mit Anschluss zu einem der Wegenden herunterladen"
+msgstr "OSM-Daten entlang der ausgewählten Wege herunterladen."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Jetzt herunterladen"
+msgstr "Herunterladen entlang"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
 msgstr ""
-"Bitte wählen Sie 4 oder 5 Wege aus, damit Links-Abbiege-Verbote bestimmt "
-"werden können."
+"Bitte 1 oder mehr Wege auswählen entlang welchen der Download erfolgen soll"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
 #, java-format
 msgid "{0} intermediate nodes to download."
-msgstr ""
+msgstr "{0} Zwischenknoten downzuladen."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Test {0}/{1}: {2} starten"
+msgstr "zwischen {0} {1} und {2} {3}"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Fehler beim Parsen von {0}: {1}"
+msgstr "  hinzufügen von {0} {1}"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -17214,9 +17296,9 @@
 msgstr "Weg duplizieren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Ebene zum Ändern von GPS-Spuren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "In GPX-Ebene mit anonymer Zeit konvertieren"
@@ -17226,5 +17308,5 @@
 msgstr "GPX-Ändern"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "GPS-Spuren ändern"
@@ -17233,11 +17315,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Weg aus GPX-Ebene importieren"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Existierenden Weg verwerfen"
@@ -17247,5 +17329,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Keine GPX-Datenebene gefunden."
@@ -17255,13 +17337,13 @@
 msgstr "Skripte haben ungültige Daten zurückgelieferte."
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr "Bearbeitunsgwerkzeug"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr "Name:"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr "Kommandozeile:"
@@ -17503,5 +17585,5 @@
 msgstr "Nicht georeferenzierte Bilder anzeigen"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Importierte Bilder"
@@ -17865,8 +17947,6 @@
 msgstr "Fenster mit den Messungen öffnen."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Zurücksetzen"
@@ -17897,5 +17977,5 @@
 msgstr "Winkel zwischen zwei gewählten Knoten"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Ebene für Messungen"
@@ -17993,5 +18073,5 @@
 msgstr "OpenStreetBugs Lade-Warteschleife"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugs-Einträge anzeigen"
@@ -18038,5 +18118,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
 msgid "Process queue"
-msgstr "Aufgabenliste"
+msgstr "Warteschlange abarbeiten"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:112
@@ -18067,13 +18147,13 @@
 msgstr "Warteschlange"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "Abgemeldet"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "Angemeldet"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -18191,95 +18271,95 @@
 msgstr "Firefox-Programm"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "Lesefehler!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "Schreibfehler!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "Koodinaten in Bild speichern"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 "Positionsinformationen in den EXIF-Daten der folgenden Dateien speichern:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "Einstellungen"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "Behalte Sicherungsdateien"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "Modifikationsszeit der Bilddateien anpassen:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "an die GPS-Zeit"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "auf die alte Zeit zurücksetzen"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr "Foto-Geotagging-Plugin"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "Positionsinformationen werden in Bilddateien gespeichert..."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "Kann die Modifikationszeit der Datei nicht lesen."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "Kann die Modifikationszeit der Datei nicht ändern."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "Datei konnte nicht gelöscht werden!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "Datei konnte nicht umbenannt werden!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr "<html><h3>Es gibt alte Sicherungsdateien im Bilderverzeichnis!</h3>"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "Alte Sicherungsdateien überschreiben?"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "Alte Sicherungsdateien behalten und fortfahren"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "Überschreiben"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "Kann temporäre Datei nicht löschen!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "Test fehlgeschlagen: mtime konnte nicht gelesen werden."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "Test fehlgeschlagen: mtime konnte nicht geschrieben werden."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "Koodinaten in Bild speichern"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -18320,9 +18400,9 @@
 msgstr "Neue Bildebene aus einer Datei..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "Bild nicht korrekt erstellt."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "Kartenobjekt wurde nicht gefunden."
@@ -18500,20 +18580,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "Vereinigte Version"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "Alle Fernsteueraktionen manuell bestätigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Ein Plugin, das es anderen Programmen erlaubt, JOSM zu kontrollieren."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Fernbedienung"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Einstellungen für das Fernbedienungs-Plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18525,51 +18610,59 @@
 "Anwendungen adressiert werden muss, die das Plugin nutzen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Erlaubte Aktionen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Die Fernsteuerung soll Daten von der API herunterladen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Details der Anfrage: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Soll dies erlaubt werden?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Fernsteueraktion bestätigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 "Das Fernsteuer-Plugin wurde gefragt, ob es einen neuen Knoten erstellen kann."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Die Fernsteuerung soll Daten von folgender URL herunterladen:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr "Ändersatz vollständig umkehren"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr "Nur Auswahl umkehren"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr "Auswahl umkehren und gelöschte Objekte wiederherstellen"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -18577,5 +18670,5 @@
 msgstr "Änderungssatz umkehren"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Rückgängig"
@@ -18778,41 +18871,41 @@
 msgstr "Unnötige Knoten aus Flächen entfernen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Karte"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Autom. Zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Kachel laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "Kachelinformationen anzeigen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Alle Kacheln laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Zoom erhöhen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Zoom reduzieren"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "An Kachelgröße anpassen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Kachel-Zwischenspeicher leeren"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "Bild "
@@ -19117,4 +19210,14 @@
 msgid "Terrace"
 msgstr "Abteilen"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Trenner"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19882,6 +19985,6 @@
 msgstr "Fehlendes Merkmal {0}={1} hinzufügen"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19894,9 +19997,9 @@
 "schneidet dort den Weg <span class=\"object-name\">{3}</span>."
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr "Jetzt auftrennen"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr "Trennt den Weg auf"
@@ -19979,6 +20082,6 @@
 msgstr "{0} gefunden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19986,5 +20089,5 @@
 msgstr "Ergebnisse der Datenprüfung"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Keine Fehler gefunden"
@@ -20228,32 +20331,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Doppelten Knoten zusammenführen?"
+msgstr "Doppelte Knoten verschiedenen Typs"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Doppelte Knoten"
+msgstr "Doppelte Straßen-Knoten"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Doppelte Knoten"
+msgstr "Doppelte Eisenbahn-Knoten"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Doppelten Knoten zusammenführen?"
+msgstr "Doppelte Wasserweg-Knoten"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Doppelte Knoten"
+msgstr "Doppelte Grenz-Knoten"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Doppelten Knoten zusammenführen?"
+msgstr "Doppelte Strom-Knoten"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -20292,5 +20389,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20824,5 +20921,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "Fläche"
@@ -20964,10 +21061,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr "Zeigt die aktuelle Position im Video"
@@ -21119,10 +21216,10 @@
 "lesen"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -21330,9 +21427,5 @@
 "nicht identisch. Das kann zu falschen Koordinaten führen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automatisches Laden"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21341,19 +21434,19 @@
 "ungültiges Format hat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(deaktiviert)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -21368,17 +21461,17 @@
 "heruntergeladen werden?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Ja, Kacheln herunterladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "Ungültige URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Sichtbare Kacheln laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21387,48 +21480,52 @@
 "die Auflösung"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Auflösung ändern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Fehlerhafte Kacheln neu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Alphakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "WMS-Ebene in Datei speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "WMS-Ebene speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "WMS-Ebene aus Datei laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "WMS-Ebene laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Dateiformatfehler"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Fehler beim Laden der Datei"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "WMS-Lesezeichen erstellen"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automatisches Laden"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -21507,5 +21604,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -21543,5 +21640,5 @@
 msgstr "Audiogerät nicht verfügbar"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -21564,5 +21661,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "Forst"
@@ -21575,12 +21672,10 @@
 #. relation type
 #: build/specialmessages.java:17
-#, fuzzy
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr "Eine Straßenzugehörigkeitsrelation erzeugen"
+msgstr "Zugeordnete Straße"
 
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
@@ -21589,19 +21684,16 @@
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Erhöhen"
+msgstr "Verkehrskontrolle"
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "Freileitung (Starkstrom)"
+msgstr "Linie"
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
@@ -21610,5 +21702,4 @@
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
@@ -21617,19 +21708,16 @@
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "Öffentliche Verkehrsmittel"
+msgstr "Öffentlicher Nahverkehr"
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Einschränkung"
+msgstr "Abbiegebeschränkung"
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
@@ -21638,15 +21726,13 @@
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Örtlichkeit"
+msgstr "Gelände"
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "Gewässer"
+msgstr "Wasserlauf"
 
 #. Strings in JFileChooser
@@ -21933,7 +22019,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
+msgstr "Lädt OSM-Daten entlang eines Weges herunter"
 
 #. Plugin Duplicate-Way
@@ -22169,6 +22254,11 @@
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22179,5 +22269,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22188,5 +22278,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22197,10 +22287,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr "Erlaubt es Objekte der OSM-Datenbank wiederherzustellen"
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22212,5 +22302,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22223,5 +22313,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22233,15 +22323,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 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:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22252,5 +22342,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22385,5 +22475,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Referenz"
@@ -22922,5 +23012,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "Metall"
@@ -22933,5 +23023,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "Holz"
@@ -23235,9 +23325,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "ja"
@@ -23347,9 +23437,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "nein"
@@ -23608,5 +23698,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "Ortsstraße"
@@ -23655,5 +23745,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "Service"
@@ -23688,5 +23778,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "Baustelle"
@@ -23773,5 +23863,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "Wandern"
@@ -23806,5 +23896,5 @@
 msgstr "gut"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "mittelschwer"
@@ -23974,14 +24064,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Betreiber"
@@ -24249,6 +24339,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Höhe"
@@ -24696,5 +24786,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "Marsch"
@@ -25100,5 +25190,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Spannung"
@@ -25462,31 +25552,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Öffnungszeiten"
@@ -25546,90 +25636,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
@@ -25742,7 +25832,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Referenznummer"
@@ -25758,5 +25848,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "Tiefgarage"
@@ -25769,6 +25859,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Gebühr"
@@ -25944,5 +26034,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Rollstuhl"
@@ -25979,6 +26069,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Schutzraum"
@@ -25986,5 +26076,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Sitzbank"
@@ -26103,5 +26193,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Bake"
@@ -26262,5 +26352,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Küche"
@@ -26268,73 +26358,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italienisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "chinesisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "Pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "Hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "griechisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "deutsch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "Döner"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "türkisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asiatisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thailändisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexikanisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japanisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "französisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "Sandwich"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "Sushi"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Imbiss (Fast Food)"
@@ -26342,17 +26437,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Imbiss (Fast Food-Restaurant) bearbeiten"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "Fish and Chips"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "Hähnchen"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Café"
@@ -26360,9 +26455,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Café bearbeiten"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Kneipe"
@@ -26370,18 +26465,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Kneipe bearbeiten"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Biergarten bearbeiten"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar"
@@ -26389,9 +26485,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Bar bearbeiten"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -26399,24 +26495,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Nachtclub bearbeiten"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Tourismus"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Attraktion"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Attraktion bearbeiten"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museum"
@@ -26424,9 +26520,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Museum bearbeiten"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -26435,9 +26531,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Zoo bearbeiten"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Aussichtspunkt"
@@ -26445,24 +26541,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Aussichtspunkt bearbeiten"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Aussichtsturm"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Themenpark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Themenpark bearbeiten"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Kunstausstellung"
@@ -26470,5 +26566,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Kunstausstellung bearbeiten"
@@ -26476,19 +26572,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Informationsbüro"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Karte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Detailgrad"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "topographisch"
@@ -26526,5 +26622,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26532,28 +26628,28 @@
 msgstr "Straße"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "schematisch"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Kartenausschnitt"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "Örtlichkeit"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "Stadt"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "Region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Nähere Beschreibung"
@@ -26563,5 +26659,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Dargestellte Routen für:"
@@ -26569,5 +26665,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Wanderweg"
@@ -26575,6 +26671,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Radfahren"
@@ -26582,5 +26678,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Mountainbike fahren"
@@ -26588,6 +26684,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Skifahren"
@@ -26595,5 +26691,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Reiten"
@@ -26601,46 +26697,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "...andere mögliche Transportarten"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Informationstafel"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Inhalt"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "Notiz"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "Geschichte"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "Wildtiere"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "Pflanzen"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Wegweiser"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "Mast"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Informationsterminal"
@@ -26648,29 +26752,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Nähere Beschreibung"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide per Handy?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Andere Informationspunkte"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Schutzraum bearbeiten"
@@ -26678,25 +26782,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Feuerstelle"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Picknickplatz"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Picknickplatz bearbeiten"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Historische Stätten"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Burg / Schloß"
@@ -26705,19 +26809,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Burg / Schloß bearbeiten"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruinen"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Ruinen bearbeiten"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Ausgrabungsstelle"
@@ -26726,9 +26830,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Ausgrabungsstelle bearbeiten"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Schlachtfeld"
@@ -26736,10 +26840,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Schlachtfeld bearbeiten"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Paläontologische Stätte"
@@ -26747,5 +26851,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Paläontologische Stätte bearbeiten"
@@ -26753,15 +26857,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Baudenkmal"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Baudenkmal bearbeiten"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Gedenkstätte"
@@ -26769,55 +26873,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Gedenkstätte bearbeiten"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Wegkreuz bearbeiten"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Bildstock"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Bildstock bearbeiten"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Grenzstein"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Grenzstein bearbeiten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Freizeit"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Schwimmbad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Schwimmbad bearbeiten"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Spielplatz"
@@ -26825,35 +26929,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Spielplatz bearbeiten"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Angeln"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Angelplatz bearbeiten"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Sporteinrichtungen"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Stadion bearbeiten"
@@ -26867,6 +26971,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "Sportart wählen:"
@@ -27282,31 +27386,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "Sport"
@@ -27316,240 +27420,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "Mehrfachnutzung"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "Bogenschießen"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "Leichtathletik"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr "American Football"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "Australian Football"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "Baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "Boule"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "Bowls"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr "Canadian Football"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "Kanu"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "Klettern"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "Kricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "Kricketnetze"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "Krocket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "Fahrradfahren"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "Hunderennen"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "Reiten"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr "Gaelic Football"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "Gymnastik"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "Pferderennen"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "Schlagball (Racquet)"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr "Rugby League"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr "Rugby Union"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "Schießen"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "Skateboard"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "Eislaufen"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "Skifahren"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "Fußball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "Schwimmen"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "Tischtennis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Sporthalle / Fitnesscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Sporthalle / Fitnesscenter bearbeiten"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Spielfeld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Rennbahn"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Rennbahn bearbeiten"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golfanlage"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Golfanlage bearbeiten"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Minigolfplatz bearbeiten"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Mehrfachnutzung"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Mehrfach genutzten Sportplatz bearbeiten"
@@ -27591,23 +27695,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "Typ"
@@ -27649,211 +27753,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "Spielfeld"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "Sporthalle / Fitnesscenter"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "Weg"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Bowlinghalle bearbeiten"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Leichtathletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Leichtathletikfeld bearbeiten"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Bogenschießen"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Bogenschießplatz bearbeiten"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Klettern"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Kletterbereich bearbeiten"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Kanufahren"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Kanufahrtstrecke bearbeiten"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Radsporthalle oder -kurs bearbeiten"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Hunderennen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Trainingsplatz für Hunde bearbeiten"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Reitplatz"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Reitplatz bearbeiten"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Pferderennen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Pferderennplatz bearbeiten"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Gymnastikbereich bearbeiten"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Motorsportplatz bearbeiten"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Eislaufen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Eislaufbahn bearbeiten"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Skateboardplatz bearbeiten"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Schwimmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Schwimmbad bearbeiten"
@@ -27861,52 +27965,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Skipiste bearbeiten"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Pistentyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "Abfahrt"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "Langlauf"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "Schneepark"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "Anfänger"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "einfach"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "fortgeschritten"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "Experte"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "Freistil"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Schießen"
@@ -27914,204 +28018,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Schießbahn bearbeiten"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Fußball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Fußballplatz bearbeiten"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Australian Football-Platz bearbeiten"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr "American Football"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr "American Football ändern"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr "Canadian Football"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr "Canadian Football ändern"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr "Gaelic Football"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr "Gaelic Football ändern"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr "Rugby League"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr "Rugby League ändern"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr "Rugby Union"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr "Rugby Union ändern"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Baseballplatz bearbeiten"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Basketballplatz bearbeiten"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golfplatz"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Golfplatz bearbeiten"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "Golfanlage"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Boule-Spielbereich bearbeiten"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Bowls-Spielfeld bearbeiten"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Kricketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Kricketnetze"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Kricketnetze bearbeiten"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Krocketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Hockeyplatz bearbeiten"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Pelotaplatz bearbeiten"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Schlagball (Racquet)"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Schlagball (Racquet)-Platz bearbeiten"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Tischtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Tischtennisplatz bearbeiten"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Tennisplatz bearbeiten"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Gebäude"
@@ -28119,5 +28223,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Öffentliches Gebäude"
@@ -28125,10 +28229,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Öffentliches Gebäude bearbeiten"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Rathaus"
@@ -28136,10 +28240,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Rathaus bearbeiten"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Botschaft"
@@ -28147,10 +28251,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Botschaft bearbeiten"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Gericht"
@@ -28159,10 +28263,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Gericht bearbeiten"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Gefängnis"
@@ -28171,10 +28275,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Gefängnis bearbeiten"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Polizei"
@@ -28184,10 +28288,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Polizei bearbeiten"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Feuerwache"
@@ -28196,10 +28300,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Feuerwache bearbeiten"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Post"
@@ -28207,5 +28311,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Post bearbeiten"
@@ -28213,15 +28317,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Kindergarten"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Kindergarten bearbeiten"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Schule"
@@ -28229,10 +28333,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Schule bearbeiten"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Universität"
@@ -28240,10 +28344,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Universität bearbeiten"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Hochschule"
@@ -28251,5 +28355,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "College bearbeiten"
@@ -28257,5 +28361,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Kino"
@@ -28264,10 +28368,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Kino bearbeiten"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Bibliothek"
@@ -28276,9 +28380,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Bibliothek bearbeiten"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Kulturzentrum"
@@ -28286,10 +28390,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Kulturzentrum bearbeiten"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Theater"
@@ -28298,10 +28402,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Theater bearbeiten"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Kirche"
@@ -28311,5 +28415,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Kirche bearbeiten"
@@ -28318,6 +28422,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religion"
@@ -28326,66 +28430,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahaiistisch"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "buddhistisch"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "christlich"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hinduistisch"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jainistisch"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "jüdisch"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "moslemisch"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikhistisch"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "spiritistisch"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoistisch"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "unitarisch"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastrisch"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Konfession"
@@ -28394,81 +28498,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglikanisch"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptistisch"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "katholisch"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evangelikal"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "Zeugen Jehovas"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "lutherisch"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "methodistisch"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormonisch"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "Pfingstgemeinde"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbyterianisch"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestantisch"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "Quäker"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "schiitisch"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunnitisch"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Adressen"
@@ -28477,5 +28581,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Adressinformationen bearbeiten"
@@ -28483,5 +28587,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Hausnummer"
@@ -28489,25 +28593,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Hausname"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Straßenname"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Ortsname"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Postleitzahl"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Länderkennung"
@@ -28516,5 +28620,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Adressinterpolation bearbeiten"
@@ -28522,61 +28626,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Nummernschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "ungerade"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "gerade"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alphabetisch"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Fabrik bearbeiten"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Turm"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Turm bearbeiten"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Art des Turms"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "Kommunikation"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "Beobachtung"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Höhe (in Meter)"
@@ -28584,25 +28688,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Wasserturm"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Wasserturm bearbeiten"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Gasometer bearbeiten"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Leuchtturm"
@@ -28610,10 +28714,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Leuchtturm bearbeiten"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Windmühle"
@@ -28621,10 +28725,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Windmühle bearbeiten"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -28633,41 +28737,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Pipeline bearbeiten"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "Gas"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "Wärme"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "Öl"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "Abwasser"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "Beliebige Substanz"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Ort"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "Unter Wasser"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "oberirdisch"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Kläranlage"
@@ -28677,10 +28781,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Kläranlage bearbeiten"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Stationärer Kran"
@@ -28688,5 +28792,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Stationären Kran bearbeiten"
@@ -28694,10 +28798,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Bake bearbeiten"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Vermessungspunkt"
@@ -28705,10 +28809,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Vermessungspunkt bearbeiten"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Überwachungskamera"
@@ -28716,23 +28820,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Überwachungskamera bearbeiten"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "im Gebäude"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "im Freien"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "öffentlich"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Stromgenerator"
@@ -28742,35 +28846,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Stromgenerator bearbeiten"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "Wind"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "Wasser"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "Fossil"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "Nuklear"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "Kohle"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "Photovoltaik"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Umspannwerk"
@@ -28779,10 +28883,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Umspannwerk bearbeiten"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Trafostation"
@@ -28791,5 +28895,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Trafostation bearbeiten"
@@ -28797,10 +28901,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Liniennummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Strommast"
@@ -28811,23 +28915,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Strommast bearbeiten"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "Turm"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "Mast"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Identifikation des Turms"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Stromleitung"
@@ -28836,22 +28940,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Stromleitung bearbeiten"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Art der Stromleitung"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
 msgstr "Freileitung (Starkstrom)"
 
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28859,55 +28961,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Anzahl Leitungen"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Anzahl der Adern (besser: Leiter) je Stromkabel"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "einzeln"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "doppelt"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "dreifach"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "vierfach"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Einrichtungen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "limitiert"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Briefkasten"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefon"
@@ -28916,5 +29018,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Telefon bearbeiten"
@@ -28922,5 +29024,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Münzen"
@@ -28928,5 +29030,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Scheine"
@@ -28934,5 +29036,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Geld- oder Prepaidkarten"
@@ -28940,5 +29042,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Konto- oder EC-Karten"
@@ -28946,15 +29048,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Kreditkarten"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telefonkarten"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Recyclingstelle & -container"
@@ -28963,5 +29065,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Recyclingstelle oder -container bearbeiten"
@@ -28969,35 +29071,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Batterien"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Dosen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Kleidung"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Altmetall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Abfalleimer"
@@ -29005,5 +29107,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Abfalleimer bearbeiten"
@@ -29012,31 +29114,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Lehne"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "Stein"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "Kunststoff"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Farbe"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "schwarz"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "braun"
@@ -29115,39 +29217,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "grün"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "rot"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "blau"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "grau"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "weiß"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Anzahl der Sitzplätze"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Jagdanstand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Jagdanstand bearbeiten"
@@ -29156,30 +29258,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Höhe"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "niedrig"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "halb"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "voll"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Versteck"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Schloß"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Springbrunnen"
@@ -29188,10 +29290,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Springbrunnen bearbeiten"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Trinkwasser"
@@ -29200,10 +29302,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Trinkwasserabgabe bearbeiten"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -29212,5 +29314,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Hydrant bearbeiten"
@@ -29218,5 +29320,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Babyklappe"
@@ -29224,15 +29326,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Babyklappe bearbeiten"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Geschäfte"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Autohändler"
@@ -29240,10 +29342,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Autohaus bearbeiten"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Fahrradladen"
@@ -29252,28 +29354,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Fahrradladen bearbeiten"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Supermarkt bearbeiten"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Drogerie bearbeiten"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Tante-Emma-Laden"
@@ -29281,9 +29383,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Tante-Emma-Laden bearbeiten"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -29291,27 +29393,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Kiosk bearbeiten"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Buchhandlung"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Buchhandlung bearbeiten"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Reisebüro"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Reisebüro bearbeiten"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Fleischer"
@@ -29319,9 +29421,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Fleischer bearbeiten"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Bäcker"
@@ -29329,9 +29431,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Bäcker bearbeiten"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Blumenladen"
@@ -29339,18 +29441,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Blumenladen bearbeiten"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Bioladen"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Bioladen bearbeiten"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Spirituosen"
@@ -29358,54 +29460,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Spirituosengeschäft bearbeiten"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Getränke"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Getränkeladen bearbeiten"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Computergeschäft bearbeiten"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Elektronikgeschäft"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Elektronikgeschäft bearbeiten"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Hifi-Geschäft bearbeiten"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Mobiliar"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Möbelgeschäft bearbeiten"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Gartenzentrum"
@@ -29413,9 +29515,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Gartenzentrum bearbeiten"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Haushaltswaren"
@@ -29423,9 +29525,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Haushaltswaren bearbeiten"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Heimwerkerbedarf"
@@ -29433,54 +29535,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Geschäft für Heimwerkerbedarf bearbeiten"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Bürobedarf"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Bürobedarf bearbeiten"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Friseur"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Friseur bearbeiten"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Schuhe"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Schuhladen bearbeiten"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Spielzeug"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Spielzeuggeschäft bearbeiten"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Videoverleih"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Videogeschäft bearbeiten"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Chemische Reinigung"
@@ -29488,9 +29590,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Chemische Reinigung bearbeiten"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Waschsalon"
@@ -29498,9 +29600,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Waschsalon bearbeiten"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Camping (Outdoor)"
@@ -29508,24 +29610,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Sportgeschäft bearbeiten"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Optiker bearbeiten"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Verkaufsautomat"
@@ -29533,5 +29635,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Automaten bearbeiten"
@@ -29539,97 +29641,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Automatenprodukte"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "Fahrscheine"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "Pläne des öffentlichen Nahverkehrs"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "Parkscheine"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "Essen"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "Getränke"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "Süßigkeiten"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "Zigaretten"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "Tiernahrung"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "Zeitungen"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "Spielzeug"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "Briefmarken"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-Karten"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "Telefonkarten"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "Karten/Belege"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr "Fahrradschlauch"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "Kondome"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "Tampons"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "Hundekot-Tüten"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Kundenkarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Geld"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Bank"
@@ -29637,14 +29739,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Bank bearbeiten"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Geldautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Wechselstube"
@@ -29652,5 +29754,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Wechselstube bearbeiten"
@@ -29658,15 +29760,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomat bearbeiten"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Gesundheit"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Arzt"
@@ -29674,18 +29776,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Arzt bearbeiten"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Zahnarzt"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Zahnarzt bearbeiten"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Apotheke"
@@ -29693,5 +29795,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Apotheke bearbeiten"
@@ -29699,9 +29801,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Rezepteinlösung"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Krankenhaus"
@@ -29709,10 +29811,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Krankenhaus bearbeiten"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Notfallrettungspunkt"
@@ -29721,5 +29823,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Notfallrettungspunkt bearbeiten"
@@ -29728,20 +29830,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Punktname"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)"
@@ -29749,5 +29851,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Tierarzt"
@@ -29756,64 +29858,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Tierarzt bearbeiten"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Orte"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Kontinent bearbeiten"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Staat"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Staat bearbeiten"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Bundesland"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Bundesland bearbeiten"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Region bearbeiten"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Landkreis"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Landkreis bearbeiten"
@@ -29821,15 +29923,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Großstadt"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Großstadt bearbeiten"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Stadt"
@@ -29837,10 +29939,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Stadt bearbeiten"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Stadtteil"
@@ -29848,25 +29950,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Stadtteil bearbeiten"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Dorf"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Dorf bearbeiten"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Weiler"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Weiler bearbeiten"
@@ -29874,5 +29976,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Unbewohnter Ort"
@@ -29880,10 +29982,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Unbewohnten Ort bearbeiten"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Insel"
@@ -29891,10 +29993,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Insel bearbeiten"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Kleine Insel"
@@ -29902,5 +30004,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Kleine Insel bearbeiten"
@@ -29908,5 +30010,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Höhleneingang"
@@ -29914,10 +30016,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Höhleneingang bearbeiten"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Bergspitze"
@@ -29925,10 +30027,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Bergspitze bearbeiten"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Gletscher"
@@ -29936,10 +30038,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Gletscher bearbeiten"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Vulkan"
@@ -29947,70 +30049,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Vulkan bearbeiten"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Staat"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Staatsgrenze bearbeiten"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Innerstaatlich"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Innerstaatliche Grenze bearbeiten"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Zivil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Zivilrechtliche Grenze bearbeiten"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Politisch"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Politische Grenze bearbeiten"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Nationalparkgrenze bearbeiten"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Landnutzung"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Baum"
@@ -30019,15 +30121,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Baum bearbeiten"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Botanischer Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Naturwald"
@@ -30036,5 +30138,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Naturwald bearbeiten"
@@ -30042,17 +30144,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "Nadelwald"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "Laubwald"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "Mischwald"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Forst"
@@ -30061,14 +30163,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Forst bearbeiten"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Naturdenkmal & Reservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Naturdenkmal oder Reservat bearbeiten"
@@ -30076,25 +30178,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Geröll"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Geröll bearbeiten"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Buschland"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Buschland bearbeiten"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Gebirge"
@@ -30102,10 +30204,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Gebirge bearbeiten"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Heide"
@@ -30113,5 +30215,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Heide bearbeiten"
@@ -30119,5 +30221,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Bauernhof"
@@ -30126,45 +30228,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Bauernhof bearbeiten"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Ackerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Ackerland bearbeiten"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Wiese"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Wiese bearbeiten"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Weinberg"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Weinberg bearbeiten"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Schrebergärten"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Schrebergärten bearbeiten"
@@ -30172,25 +30274,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Garten"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Garten bearbeiten"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Grasfläche bearbeiten"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Dorfanger"
@@ -30198,10 +30300,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Dorfanger bearbeiten"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Öffentlicher Bereich"
@@ -30209,20 +30311,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Öffentlichen Bereich bearbeiten"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Park bearbeiten"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Erholungsgebiet"
@@ -30230,5 +30332,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Erholungsgebiet bearbeiten"
@@ -30236,15 +30338,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Wohngebiet"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Wohngebiet bearbeiten"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Kleiner Friedhof"
@@ -30252,9 +30354,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Kleinen Friedhof bearbeiten"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Friedhof"
@@ -30262,39 +30364,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Friedhof bearbeiten"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Einkaufsbereich"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Einkaufsbereich bearbeiten"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Gewerbegebiet"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Gewerbegebiet bearbeiten"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industrie"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Industriegebiet bearbeiten"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Eisenbahngelände"
@@ -30302,15 +30404,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Eisenbahngelände bearbeiten"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Militärgebiet"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Militärgebiet bearbeiten"
@@ -30318,50 +30420,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Baustellengebiet"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Baustelle bearbeiten"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Baulücke"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Baulücke bearbeiten"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Bauland"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Bauland bearbeiten"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Deponie"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Deponie bearbeiten"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Steinbruch"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Steinbruch bearbeiten"
@@ -30371,5 +30473,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Ein Multipolygon bearbeiten"
@@ -30381,5 +30483,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "Äußeres Segment"
@@ -30387,5 +30489,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "Inneres Segment"
@@ -30393,5 +30495,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr "Grenze"
@@ -30402,5 +30504,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr "Grenze anpassen"
@@ -30408,36 +30510,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr "Grenztyp"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr "administrativ"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr "national"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr "zivil"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr "politisch"
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr "Administrationsebene"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr "Teilgebiet"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr "Administrationszentrum"
@@ -30445,5 +30547,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Abbiegeeinschränkung"
@@ -30452,5 +30554,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Abbiegeeinschränkung bearbeiten"
@@ -30458,34 +30560,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Einschränkung"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "Nicht links abbiegen"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "Nicht rechts abbiegen"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "Nicht geradeaus"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "Wendeverbot"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "Nur rechts abbiegen"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "Nur links abbiegen"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "Nur geradeaus"
@@ -30494,15 +30596,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "Von Weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "Über Knoten oder Weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "Zu Weg"
@@ -30510,5 +30612,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Route"
@@ -30517,5 +30619,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Route bearbeiten"
@@ -30523,5 +30625,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Routentyp"
@@ -30629,5 +30731,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30638,17 +30740,17 @@
 msgstr "Fahrrad"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "Bus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "Straße"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "Fähre"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "Ski"
@@ -30716,5 +30818,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30724,9 +30826,9 @@
 msgstr "Fuß"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "Straßenbahn"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "Umleitung"
@@ -30740,10 +30842,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "U-Bahn"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Symbolbeschreibung"
@@ -30751,31 +30853,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Netzwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Routenstatus"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "geplant"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "temporär"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "Verbindung"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Farbe (hex)"
@@ -30784,30 +30886,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "Routenabschnitt"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "Vorwärts-Abschnitt"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "Rückwärts-Abschnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "Haltepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "Vorwärts-Haltepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "Rückwärts-Haltepunkt"
@@ -31034,5 +31136,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "veraltet"
@@ -31685,4 +31787,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -31786,11 +31896,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "Zivilisationsbauten"
@@ -32303,5 +32413,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "Anlegestelle (Pier)"
@@ -32315,5 +32425,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "Pipeline"
@@ -32457,13 +32567,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "Freizeit"
@@ -32477,5 +32587,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "Jachthafen"
@@ -32571,10 +32681,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "Einrichtungen"
@@ -32676,10 +32786,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "Verkehrseinrichtungen"
@@ -33117,24 +33227,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "Einrichtungen (hell)"
@@ -33166,6 +33276,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "Wasser (hell)"
@@ -33226,8 +33336,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "Gesundheit"
@@ -33580,26 +33690,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "Geschäft"
@@ -33671,8 +33781,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "Hotel"
@@ -33773,9 +33883,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "Tourismus"
@@ -33863,9 +33973,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "Historisch"
@@ -33878,5 +33988,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "Steinbruch"
@@ -33890,5 +34000,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "Mülldeponie"
@@ -33910,5 +34020,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "Wasserbecken"
@@ -33922,5 +34032,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "Farmland"
@@ -33943,5 +34053,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "Einkaufsbereich"
@@ -33955,5 +34065,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "Industriegebiet"
@@ -33967,5 +34077,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "Baulücke"
@@ -33979,5 +34089,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "Bauland"
@@ -33991,5 +34101,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "Eisenbahnland"
@@ -34046,7 +34156,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "Militär"
@@ -34060,5 +34170,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "Friedhof"
@@ -34071,5 +34181,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "Berggipfel"
@@ -34084,5 +34194,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "Gletscher"
@@ -34096,5 +34206,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "Vulkan"
@@ -34149,8 +34259,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "Natur"
@@ -34164,5 +34274,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "Buschland"
@@ -34176,5 +34286,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "Heide"
@@ -34188,5 +34298,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "Waldfläche"
@@ -34200,5 +34310,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "Schlick & Moor"
@@ -34212,5 +34322,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "Strand"
@@ -34288,8 +34398,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "Route"
@@ -34378,12 +34488,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "Grenze"
@@ -34533,11 +34643,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "Ort"
@@ -34551,5 +34661,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "Tiger-Daten"
@@ -34905,60 +35015,74 @@
 msgstr "Sizilien - Italien"
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Der gewählte Weg enthält nicht den gewählten Knoten."
+#~ msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Knoten."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Grad Minuten Sekunden"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr ""
+#~ "Bitte einen Kommentar für den Änderungssatz eingeben. (mind. 3 Zeichen)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Bitte geben Sie einen Kommentar für den Änderungssatz ein (mind. 3 "
+#~ "Zeichen)."
+
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
+
+#~ msgid "football"
+#~ msgstr "American Football"
+
+#~ msgid "Football"
+#~ msgstr "American Football"
+
+#~ msgid "Style for outer way ''{0}'' mismatches."
+#~ msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
+
+#~ msgid "Error: {0}"
+#~ msgstr "Fehler: {0}"
+
+#~ msgid "Warning: {0}"
+#~ msgstr "Warnung: {0}"
+
+#~ msgid "Painting problem"
+#~ msgstr "Zeichenproblem"
+
+#~ msgid "Check for paint notes."
+#~ msgstr "Zeichennotizen prüfen."
+
+#~ msgid "Check if map painting found data errors."
+#~ msgstr "Prüfen, ob beim Kartenzeichnen Fehler aufgetreten sind."
+
+#~ msgid "Area style way is not closed."
+#~ msgstr "Flächenförmiger Weg ist nicht geschlossen."
+
+#~ msgid "More than one \"from\" way found."
+#~ msgstr "Mehr als ein Weg mit \"from\" gefunden."
+
+#~ msgid "More than one \"to\" way found."
+#~ msgstr "Mehr als ein Weg mit \"to\" gefunden."
+
+#~ msgid "Unknown role ''{0}''."
+#~ msgstr "Unbekannte Role \"{0}\"."
+
+#~ msgid "Unknown member type for ''{0}''."
+#~ msgstr "Unbekannter Elementtyp für \"{0}\"."
+
+#~ msgid "No \"from\" way found."
+#~ msgstr "Kein \"from\"-Weg gefunden."
+
+#~ msgid "No \"to\" way found."
+#~ msgstr "Kein \"to\"-Weg gefunden."
+
+#~ msgid "Style for restriction {0} not found."
+#~ msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
+
 #~ msgid "closedway"
 #~ msgstr "geschlossener Weg"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "Ziel vom Typ {0} mit ID {1} hat ungültige Version"
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
-
-#~ msgid "football"
-#~ msgstr "American Football"
-
-#~ msgid "Football"
-#~ msgstr "American Football"
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
-
-#~ msgid "Error: {0}"
-#~ msgstr "Fehler: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Warnung: {0}"
-
-#~ msgid "Painting problem"
-#~ msgstr "Zeichenproblem"
-
-#~ msgid "Check for paint notes."
-#~ msgstr "Zeichennotizen prüfen."
-
-#~ msgid "Check if map painting found data errors."
-#~ msgstr "Prüfen, ob beim Kartenzeichnen Fehler aufgetreten sind."
-
-#~ msgid "Area style way is not closed."
-#~ msgstr "Flächenförmiger Weg ist nicht geschlossen."
-
-#~ msgid "More than one \"from\" way found."
-#~ msgstr "Mehr als ein Weg mit \"from\" gefunden."
-
-#~ msgid "More than one \"to\" way found."
-#~ msgstr "Mehr als ein Weg mit \"to\" gefunden."
-
-#~ msgid "Unknown role ''{0}''."
-#~ msgstr "Unbekannte Role \"{0}\"."
-
-#~ msgid "Unknown member type for ''{0}''."
-#~ msgstr "Unbekannter Elementtyp für \"{0}\"."
-
-#~ msgid "No \"from\" way found."
-#~ msgstr "Kein \"from\"-Weg gefunden."
-
-#~ msgid "No \"to\" way found."
-#~ msgstr "Kein \"to\"-Weg gefunden."
-
-#~ msgid "Style for restriction {0} not found."
-#~ msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
 
 #~ msgid "More than one \"via\" found."
@@ -35155,4 +35279,7 @@
 #~ "fortfahren?"
 
+#~ msgid "Target of type {0} with id {1} has invalid version"
+#~ msgstr "Ziel vom Typ {0} mit ID {1} hat ungültige Version"
+
 #~ msgid "Create house number and street name relation"
 #~ msgstr "Hausnummern- und Straßennamenrelation erzeugen"
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 22568)
+++ applications/editors/josm/i18n/po/el.po	(revision 22569)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
 "PO-Revision-Date: 2010-04-20 18:36+0000\n"
 "Last-Translator: bastik <Unknown>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-07-28 09:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -225,5 +224,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -239,5 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -257,11 +256,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -269,20 +269,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -315,5 +315,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Συγχώνευση"
@@ -381,5 +381,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -393,5 +393,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -413,4 +413,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -427,6 +428,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -438,5 +439,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -571,22 +572,22 @@
 msgstr "Λήψη ανοιχτών ομάδων αλλαγών..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Σύνδεση Διαδρομής"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Σύνδεση διάφορων διαδρομών σε μια."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Αλλαγή κατευθήνσεων;"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Αντισροφή και Συνδυασμός"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -596,5 +597,5 @@
 "να αντιστρέψετε μερικές από αυτές;"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -602,10 +603,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Ένωσε {0} διαδρομές"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον δυο διαδρομές προς σύνδεση."
@@ -652,10 +653,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -794,5 +795,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -858,10 +859,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Εξαγωγή σε GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Εξαγωγή των δεδομένων σε αρχείο GPX."
@@ -1057,5 +1058,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1473,20 +1474,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1510,5 +1511,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1519,6 +1520,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Σφάλμα"
@@ -1545,5 +1546,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1551,5 +1552,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Αποθήκευση τρεχόντων δεδομένων."
@@ -1604,10 +1605,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Αποθήκευση τρεχόντων δεδομένων σε νέο αρχείο."
@@ -1654,5 +1655,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1679,5 +1680,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Όχι, ακύρωση"
@@ -1747,18 +1748,24 @@
 msgstr[1] "Απλοποίηση Διαδρομής (αφαίρεση {0} κόμβων)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Διαίρεση Διαδρομής"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Διαίρεση διαδρομής στον επιλεγμένο κόμβο."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για διαίρεση."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Οι επιλεγμένοι κόμβοι δεν είναι στην ίδια διαδρομή"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1766,5 +1773,5 @@
 msgstr[1] "Οι επιλεγμένοι κόμβοι δεν είναι στη μέση κάποιας διαδρομής"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1780,16 +1787,6 @@
 "επιλέξατε. Παρακαλώ επιλέξτε και τον δρόμο."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Οι επιλεγμένοι κόμβοι δεν είναι στην ίδια διαδρομή"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Η επιλεγμένη διαδρομή δεν περιέχει τον επιλεγμένο κόμβο."
-msgstr[1] "Η επιλεγμένη διαδρομή δεν περιέχει όλους τους επιλεγμένους κόμβους."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
@@ -1797,5 +1794,5 @@
 "διαδρομή."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1805,5 +1802,5 @@
 "Επιλέξτε κόμβους στη μέση της διαδρομής.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1811,5 +1808,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1817,5 +1814,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1962,5 +1959,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2939,22 +2936,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3095,25 +3092,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Διαγραφή κόμβου {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Διαγραφή διαδρομής {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Διαγραφή σχέσης {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3122,5 +3119,5 @@
 msgstr[1] "Διαγραφή {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3129,5 +3126,5 @@
 msgstr[1] "Διαγραφή {0} κόμβων"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3136,5 +3133,5 @@
 msgstr[1] "Διαγραφή {0} διαδρομών"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3143,5 +3140,5 @@
 msgstr[1] "Διαγραφή {0} σχέσεων"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3294,5 +3291,5 @@
 msgstr "Εφαρμογή;"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3365,7 +3362,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
@@ -3375,7 +3372,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Σφάλμα κατά την δημιουργία  καταλόγου cache: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3545,42 +3542,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Μοίρες Λεπτά Δεύτερα Λεπτα"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "Ν"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "Β"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "Δ"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "Α"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3588,5 +3588,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3755,5 +3755,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "φόντο"
@@ -3897,5 +3897,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Να μην εμφανιστεί ξανά (απομνημόνευση επιλογής)"
@@ -3923,5 +3923,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "σιδηρόδρομος"
@@ -3943,6 +3943,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4011,5 +4011,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "κτίριο"
@@ -4096,5 +4096,5 @@
 msgstr "Το αντικείμενο διαγράφηκε"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4191,69 +4191,69 @@
 msgstr "Κωδικός"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "χρήση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "Επιλογές"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Εμφάνιση αυτής της βοήθειας"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Λήψη της τοποθεσίας στο URL (με lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Επιλογή με την δοθείσα αναζήτηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Επαναφορά προτιμήσεων στις προκαθορισμένες"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Επιλογή γλώσσας"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4263,9 +4263,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "παραδείγματα"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4275,46 +4275,45 @@
 "αυτή τη σειρά."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Αρχικοποίηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Ενημέρωση πρόσθετων..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Εγκατάσταση ενημερωμένων πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Ρύθμιση προκαθορισμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Δημιουργία κύριου GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Φόρτωση πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Επίλυση"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4323,5 +4322,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4417,33 +4416,33 @@
 msgstr "Σμίκρυνση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "κλίμακα"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Το γεωγραφικό μήκος στο σημείο του ποντικιού."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Το όνομα του αντικειμένου στο σημείο του ποντικιού."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Το γεωγραφικό πλάτος στο σημείο του ποντικιού."
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+msgid "The angle between the previous and the current way segment."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
-msgid "The angle between the previous and the current way segment."
+msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4451,9 +4450,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(κανένα αντικείμενο)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4469,4 +4468,18 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+msgid "Metric"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "κινέζικη"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Ηρώο"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5177,5 +5190,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "όλα"
@@ -5258,6 +5271,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5268,5 +5281,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5395,5 +5408,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr ""
@@ -5454,5 +5467,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5613,5 +5626,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5619,5 +5632,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5625,5 +5638,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5631,5 +5644,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5637,5 +5650,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5644,5 +5657,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5650,5 +5663,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5656,5 +5669,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5662,24 +5675,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5759,51 +5772,51 @@
 msgstr "Κλείσε το διάλογο, χωρίς δημιουργία νέου κόμβου"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Επίπεδα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Άνοιγμα λίστας όλων τον φορτωμένων επιπέδων."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Εναλλαγή κατάστασης ορατότητας του επιλεγμένου επιπέδου."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Εμφάνιση/Απόκρυψη"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Εναλλαγή κατάστασης ορατότητας του επιλεγμένου επιπέδου."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr ""
@@ -5813,5 +5826,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Σχέσεις"
@@ -6967,6 +6980,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7014,107 +7028,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Όνομα"
@@ -7452,5 +7466,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7537,5 +7551,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<διαφορετικά>"
@@ -8268,5 +8282,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8339,8 +8353,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Τύπος"
@@ -8369,6 +8383,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "άγνωστο"
@@ -8689,5 +8703,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Εντοπίστηκαν διενέξεις"
@@ -8746,14 +8760,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Εισάγετε το σχόλιο σας"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9187,5 +9202,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Αποστολή"
@@ -9207,5 +9222,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9213,60 +9228,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Αποστολή Αλλαγών"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Αντιστροφή"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Συνέχεια"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Να μην εμφανιστεί ξανά"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9586,103 +9633,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "σημείο gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Προσαρμογή του σχεδιασμού γραμμών"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Χρηση καθολικών ρυθμίσεων."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Προσαρμογή Χρώματος"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Προκαθορισμένο"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Επιλέξτε ένα χρώμα"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Σημάδια από Ονομασμένα Σημεία"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Εισαγωγή Ήχου"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Αρχεία Κυματομορφής (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Σημάδια ήχου από {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Εισαγωγή εικόνων"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9690,5 +9645,5 @@
 msgstr "Όνομα: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9696,5 +9651,5 @@
 msgstr "Περιγραφή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9704,23 +9659,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Μήκος: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9729,5 +9684,5 @@
 msgstr[1] "{0} διαδρομές, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9736,10 +9691,10 @@
 msgstr[1] "{0} σημεία αναφοράς"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Μετατροπή σε επίπεδο δεδομένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9749,21 +9704,21 @@
 "βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Μετατράπηκε από: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9771,10 +9726,10 @@
 msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Λήψη όλων εντός:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9782,10 +9737,10 @@
 msgstr "{0} μέτρα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Μέγιστη περιοχή ανά αίτημα:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9793,21 +9748,21 @@
 msgstr "{0} τετρ. χλμ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9819,10 +9774,10 @@
 "συνεχίσετε;</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 "Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9830,5 +9785,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9836,23 +9791,115 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Προσαρμογή του σχεδιασμού γραμμών"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Χρηση καθολικών ρυθμίσεων."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Προσαρμογή Χρώματος"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Προκαθορισμένο"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Επιλέξτε ένα χρώμα"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Σημάδια από Ονομασμένα Σημεία"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Εισαγωγή Ήχου"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Αρχεία Κυματομορφής (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Σημάδια ήχου από {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Εισαγωγή εικόνων"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Επίπεδο Δεδομένων {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "εκτός περιοχής λήψης"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "έκδοση {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9861,11 +9908,11 @@
 msgstr[1] "Εντοπίστηκαν {0} διενέξεις"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9874,36 +9921,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "το {0} αποτελείται από:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "Έκδοση API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Μετατροπή σε επίπεδο GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9911,5 +9958,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9918,5 +9965,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -9924,5 +9971,5 @@
 msgstr[1] "σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -9931,5 +9978,5 @@
 msgstr[1] "ένα ίχνος με {0} σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -9938,5 +9985,5 @@
 msgstr[1] "το {0} αποτελείται από {1} ίχνη"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -9945,24 +9992,28 @@
 msgstr[1] "{0} σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Αρχεία GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Σφάλμα κατά την ερμηνεία {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Αδυναμία ανάγνωσης \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9971,34 +10022,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Ώρα φωτογραφίας (από exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Ώρα Gps (διαβάστε από την παραπάνω φωτογραφία): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [ηη/μμ/εεεε ωω:λλ:δδ]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Βρίσκομαι στην ζώνη ώρας: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Χωρίς ημερομηνία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Άνοιγμα άλλης φωτογραφίας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Συγχρονισμός ώρας από φωτογραφία του δέκτη GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10006,93 +10057,93 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Μη έγκυρη ημερομηνία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "Ίχνος GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Άνοιγμα άλλου ίχνους GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Ζώνη Ώρας: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Μετατόπιση:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Συσχέτιση"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Λανθασμένη ζώνη ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10102,20 +10153,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Ζώνη ώρας: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Λεπτά: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Δευτερόλεπτα: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10124,5 +10175,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10130,21 +10181,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Ρύθμιση ζώνης ώρας και απόκλεισης"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "Οι επιλεγμένες φωτογραφίες δεν περιέχουν πληροφορίες ώρας."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Οι φωτογραφίες δεν περιέχουν πληροφορίες ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10152,17 +10203,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "Τ οίχνος GPX δεν περιέχει πληροφορίες ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Πρέπει να επιλέξετε ένα ίχνος GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Δεν επιλέχθηκε ίχνος GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10171,5 +10222,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10178,56 +10229,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Εξαγωγή τοποθεσιών GPS από EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Έναρξη σάρωσης καταλόγου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Ανάγνωση φωτογραφιών"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Ανάγνωση {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Σάρωση καταλόγου {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10236,5 +10283,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10243,10 +10290,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10255,5 +10302,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10353,9 +10400,9 @@
 msgstr "Εικόνες JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "σημάδι gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10363,5 +10410,5 @@
 msgstr[1] "σημάδια"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10370,9 +10417,22 @@
 msgstr[1] "{0} αποτελείται από {1} σημάδια"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr ""
+"Εναλλαγή κατάστασης ορατότητας του κειμένου και των εικονιδίων των σημαδιών."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Συγχρονισμός ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10381,5 +10441,5 @@
 "συγχρονισμού."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10387,31 +10447,18 @@
 msgstr "Ήχος συγχρονισμένος στο σημείο {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Αδυναμία συγχρονισμού στο επίπεδο που αναπαράγεται."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr ""
-"Εναλλαγή κατάστασης ορατότητας του κειμένου και των εικονιδίων των σημαδιών."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11258,4 +11305,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Κανένα"
@@ -11270,5 +11318,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11371,5 +11419,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11377,5 +11425,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr ""
@@ -11405,5 +11453,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Συγγραφέας"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Καράβι"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11411,9 +11473,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11421,9 +11483,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Μέγιστο μήκος για τοπικά αρχεία (μέτρα)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11432,25 +11494,25 @@
 "σχεδιασμό όλων των γραμμών."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Μέγιστο μήκος (μέτρα)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Σχεδιασμός βελών κατεύθυνσης για γραμμές που συνδέουν σημεία GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11458,13 +11520,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Ελάχιστη απόσταση (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Σχεδιασμός μεγαλύτερων κουκίδων για τα σημεία GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11472,9 +11534,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Χρωματισμός σημείων και τμημάτων ιχνών ανάλογα με την ταχύτητα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11482,27 +11544,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Χρωματισμός Ιχνών και Σημείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "Σημεία GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -11510,19 +11580,19 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Σχεδιασμός των ορίων των δεδομένων που λήφθηκαν από τον διακομιστή."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Σχεδιασμός των ανενερών επιπέδων με διαφορετικό χρώμα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Δεδομένα OSM"
@@ -11877,21 +11947,26 @@
 msgstr "Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Μέθοδος προβολής"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Εμφάνιση συντεταγένων ως"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Μέθοδος προβολής"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Επίπεδο για την λήψη μετρήσεων"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Προβολή Χάρτη"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12435,5 +12510,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12442,49 +12517,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Άγνωστος τύπος: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12494,15 +12569,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Σφάλμα ανάλυσης {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Υποστηρίζονται στοιχεία τύπου {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12512,17 +12587,17 @@
 msgstr[1] "Αλλαγή {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Τίποτα επιλεγμένο!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Εφαρμογή Προεπιλογής"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12540,7 +12615,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Αναζήτηση: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12549,17 +12623,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Αναζήτηση αντικειμένων."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Ζουμ στην επιλογή"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Αναζήτηση: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12858,5 +12929,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -14301,5 +14372,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14569,5 +14640,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Παρεμβολή Διευθύνσεων"
@@ -14909,41 +14980,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Όνομα οδού:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -14960,25 +15031,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15016,18 +15087,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Κτήρια"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15251,8 +15322,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "νερό"
@@ -15313,6 +15384,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "διεύθυνση"
@@ -15784,34 +15855,34 @@
 "Επιλέξτε ένα από αυτά πρώτα και μετά ξαναπροσπαθήστε"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Άδειο επίπεδο"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Επίπεδο WMS ({0}), {1} πλακίδιο(α) φορτώθηκαν"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Δεν είναι διανυσματικό."
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr "Είναι διανυσματικό."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15820,14 +15891,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -15907,24 +15978,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Λήψη αντικειμένου..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Λήψη Πρόσθετου"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
 msgstr ""
-"Παρακαλώ επιλέξτε έναν ή περισσότερους κλειστούς δρόμους από τουλάχιστον "
-"τέσσερις κόμβους."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -15939,7 +16004,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Φόρτωση {0}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -15970,9 +16035,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15982,5 +16047,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -15989,11 +16054,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr ""
@@ -16003,5 +16068,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr ""
@@ -16011,13 +16076,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16256,5 +16321,5 @@
 msgstr ""
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Εισαγμένες Εικόνες"
@@ -16615,8 +16680,6 @@
 msgstr "Άνοιγμα του παραθύρου μετρήσεων"
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Μηδενισμός"
@@ -16647,5 +16710,5 @@
 msgstr "Γωνία μεταξύ δύο επιλεγμένων Κόμβων"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Επίπεδο για την λήψη μετρήσεων"
@@ -16737,5 +16800,5 @@
 msgstr "Βρόχος λήψης OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -16803,13 +16866,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -16923,93 +16986,93 @@
 msgstr "εκτελέσιμο Firefox"
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -17051,9 +17114,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17231,20 +17294,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "επιλυμένη έκδοση:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Απομακρυσμένος έλεγχος"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Ρυθμίσεις για το πρόσθετο Απομακρυσμένου Ελέγχου."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17253,50 +17321,58 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Επιτρεπώμενες ενέργειες"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Θέλετε να το επιτρέψετε;"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17304,5 +17380,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Επαναφορά"
@@ -17501,41 +17577,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Φόρτωση πλακιδίου"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Φόρτωση όλων των πλακιδίων"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Άυξηση ζουμ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Μείωση ζουμ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -17835,4 +17911,14 @@
 msgid "Terrace"
 msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Διαχωριστική γραμμή"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18519,6 +18605,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18528,9 +18614,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18609,6 +18695,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18616,5 +18702,5 @@
 msgstr "Σφάλματα επαλήθευσης"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Κανένα σφάλμα επαλήθευσης"
@@ -18855,32 +18941,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Αφαίρεση διπλών κόμβων..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Αφαίρεση διπλών κόμβων..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Αφαίρεση διπλών κόμβων..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Αφαίρεση διπλών κόμβων..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Αφαίρεση διπλών κόμβων..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Αφαίρεση διπλών κόμβων..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -18917,5 +18997,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr ""
@@ -19434,5 +19514,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr ""
@@ -19568,10 +19648,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19717,10 +19797,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Χαρτιά που περπατάνε: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -19906,28 +19986,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Αυτόματη λήψη"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -19938,17 +20014,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Λήψη εμφανών πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -19956,48 +20032,52 @@
 "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Αλλαγή ανάλυσης"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Ανανέωση λανθασμένων πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Κανάλι άλφα"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Αποθήκευση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Φόρτωση επιπέδου WMS από αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Φόρτωση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Σφάλμα μορφής αρχείου"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Σφάλμα φόρτωσης αρχείου"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Αυτόματη λήψη"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20078,5 +20158,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20111,5 +20191,5 @@
 msgstr "Μη διαθέσιμη Συσκευή Ήχου"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20130,5 +20210,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "δάσος"
@@ -20147,71 +20227,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "όριο"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Μετρήσεις"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "Αγωγός"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "<πολλαπλές>"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Δίκτυο"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "μέσα μαζικής μεταφοράς"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Περιορισμός"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "διαδρομή"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Επικόλληση"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "υδατοδιαδρομή"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20485,7 +20555,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20682,6 +20751,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20690,5 +20764,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20697,5 +20771,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20704,10 +20778,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20716,5 +20790,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20724,5 +20798,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20734,15 +20808,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20751,5 +20825,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20882,5 +20956,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr ""
@@ -21419,5 +21493,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21430,5 +21504,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "άλσος"
@@ -21732,9 +21806,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "ναι"
@@ -21844,9 +21918,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "όχι"
@@ -22105,5 +22179,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "Οικιστική"
@@ -22152,5 +22226,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr ""
@@ -22185,5 +22259,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "υπό κατασκευή"
@@ -22270,5 +22344,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "πεζοπορία"
@@ -22303,5 +22377,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22471,14 +22545,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Λειτουργός"
@@ -22746,6 +22820,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Υψόμετρο"
@@ -23193,5 +23267,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "έλος"
@@ -23597,5 +23671,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Τάση ρεύματος"
@@ -23959,31 +24033,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Ώρες Λειτουργείας"
@@ -24043,90 +24117,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24239,7 +24313,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Αριθμός Αναφοράς"
@@ -24255,5 +24329,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "υπόγειο"
@@ -24266,6 +24340,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Κόστος"
@@ -24441,5 +24515,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Αναπηρικό καρότσι"
@@ -24476,6 +24550,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Καταφύγιο"
@@ -24483,5 +24557,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Παγκάκι"
@@ -24600,5 +24674,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Φάρος"
@@ -24759,5 +24833,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Κουζίνα"
@@ -24765,73 +24839,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "ιταλική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "κινέζικη"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "ελληνική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "γερμανική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "ινδική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "τοπική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "τουρκική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "ασιατική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "ταϊλανδέζικη"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "μεξικάνικη"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "ιαπωνική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -24839,17 +24918,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Επεξεργασία Εστιατορίου Fast Food"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Καφέ"
@@ -24857,9 +24936,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Επεξεργασία Καφέ"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub"
@@ -24867,18 +24946,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Επεξεργασία Pub"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Μπυραρία"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Επεξεργασία Μπυραρίας"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Μπαρ"
@@ -24886,9 +24966,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Επεξεργασία Μπαρ"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Νυχτερινό Κέντρο"
@@ -24896,24 +24976,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Νυχτερινό Κέντρο"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Τουρισμός"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Μουσείο"
@@ -24921,9 +25001,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Επεξεργασία Μουσείου"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Ζωολογικός Κήπος"
@@ -24932,9 +25012,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Επεξεργασία Ζωολογικού Κήπου"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr ""
@@ -24942,24 +25022,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Πύργος Παρατήρησης"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Θεματικό Πάρκο"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Επεξεργασία Θεματικού Πάρκου"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr ""
@@ -24967,5 +25047,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr ""
@@ -24973,19 +25053,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Γραφείο Πληροφοριών"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Χάρτης"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -25023,5 +25103,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25029,28 +25109,28 @@
 msgstr "οδός"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -25060,5 +25140,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -25066,5 +25146,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Πεζοπορία"
@@ -25072,6 +25152,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Ποδηλασία"
@@ -25079,5 +25159,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -25085,6 +25165,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr ""
@@ -25092,5 +25172,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -25098,46 +25178,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "ιστορία"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25145,29 +25232,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr ""
@@ -25175,25 +25262,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Τζάκι"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Ιστορικά Σημεία"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Κάστρο"
@@ -25202,19 +25289,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Επεξεργασία Κάστρου"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ερείπια"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Επεξεργασία Ερειπίων"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Αρχαιολογικός Χώρος"
@@ -25223,9 +25310,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Επεξεργασία Αρχαιολογικού Χώρου"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Πεδίο Μάχης"
@@ -25233,10 +25320,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Επεξεργασία Πεδίου Μάχης"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25244,5 +25331,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25250,15 +25337,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Μνημείο"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Επεξεργασία Μνημείου"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Ηρώο"
@@ -25266,55 +25353,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Επεξεργασία Ηρώου"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Αναψυχή"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Παιδική Χαρά"
@@ -25322,35 +25409,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Επεξεργασία Παιδικής Χαράς"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Ψάρεμα"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Επεξεργασία Ψαρέματος"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Αθλητικά"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Χώροι Άθλησης"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Στάδιο"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Επεξεργασία Σταδίου"
@@ -25364,6 +25451,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "επιλέξτε άθλημα:"
@@ -25779,31 +25866,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "άθληση"
@@ -25813,240 +25900,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "τοξοβολία"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "Καλαθοσφαίρηση"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "Κανόε"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "αναρρήχηση"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "ποδηλασία"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "κυνοδρομίες"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "σκοποβολή"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "κολύμβηση"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "επιτραπέζια αντισφαίρηση"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "αντισφαίρηση"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Αθλητικό Κέντρο"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Επεξεργασία Αθλητικού Κέντρου"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Μίνι Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Επεξεργασία Μίνι Golf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Άθλημα"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Πολλαπλά"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr ""
@@ -26088,23 +26175,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "τύπος"
@@ -26146,211 +26233,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "αθλητικό κέντρο"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "στάδιο"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Τοξοβολία"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Επεξεργασία τοξοβολίας"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Αναρρήχηση"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Επεξεργασία Αναρρήχησης"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Επεξεργασία Ποδηλασίας"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Κυνοδρομίες"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Επεξεργασία Κυνοδρομιών"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Ιππικό"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Επεξεργασία Ιππικού"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Μηχανοκίνητα Αθλήματα"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Κολύμβηση"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Επεξεργασία Κολύμβησης"
@@ -26358,52 +26445,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Δυσκολία"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "αρχαρίων"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "εύκολη"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Σκοποβολή"
@@ -26411,204 +26498,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Επεξεργασία Σκοποβολής"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Ποδόσφαιρο"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Επεξεργασία Ποδοσφαίρου"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Επεξεργασία Baseball"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Καλαθοσφαίρηση"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Επεξεργασία Καλαθοσφαίρησης"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Επεξεργασία Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Επεξεργασία Hockey"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Επιτραπέζια Αντισφαίριση"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Αντισφαίριση"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Επεξεργασία Αντισφαίρισης"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Κτήριο"
@@ -26616,5 +26703,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Δημόσιο Κτήριο"
@@ -26622,10 +26709,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Επεξεργασία Δημοσίου Κτηρίου"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Δημαρχείο"
@@ -26633,10 +26720,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Επεξεργασία Δημαρχείου"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Πρεσβεία"
@@ -26644,10 +26731,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Επεξεργασία Πρεσβείας"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Δικαστήρια"
@@ -26656,10 +26743,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Επεξεργασία Δικαστηρίων"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Φυλακή"
@@ -26668,10 +26755,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Επεξεργασία Φυλακής"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Αστυνομία"
@@ -26681,10 +26768,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Επεξεργασία Αστυνομίας"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Πυροσβεστείο"
@@ -26693,10 +26780,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Επεξεργασία Πυροσβεστείου"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Ταχυδρομείο"
@@ -26704,5 +26791,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Επεξεργασία Ταχυδρομείου"
@@ -26710,15 +26797,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Νηπιαγωγείο"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Επεξεργασία Νηπιαγωγείου"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Σχολείο"
@@ -26726,10 +26813,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Επεξεργασία Σχολείου"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Πανεπιστήμιο"
@@ -26737,10 +26824,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Επεξεργασία Πανεπιστημίου"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Κολέγιο"
@@ -26748,5 +26835,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Επεξεργασία Κολεγίου"
@@ -26754,5 +26841,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Κινηματογράφος"
@@ -26761,10 +26848,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Επεξεργασία Κινηματογράφου"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Βιβλιοθήκη"
@@ -26773,9 +26860,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Επεξεργασία Βιβλιοθήκης"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Κέντρο Τεχνών"
@@ -26783,10 +26870,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Επεξεργασία Κέντρου Τεχνών"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Θέατρο"
@@ -26795,10 +26882,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Επεξεργασία Θεάτρου"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Τόπος Λατρείας"
@@ -26808,5 +26895,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Επεξεργασία Τόπου Λατρείας"
@@ -26815,6 +26902,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Θρησκεία"
@@ -26823,66 +26910,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "βουδισμός"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "χριστιανισμός"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "ινδουϊσμός"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "ιουδαϊσμός"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "μουσουλμανισμός"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "ταοϊσμός"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Δόγμα"
@@ -26891,81 +26978,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "αγγλικανικό"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "βαπτιστικό"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "καθολικό"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "ευαγγελικό"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "μαρτύρων του Ιεχοβά"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "λουθερανικό"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "ορθόδοξο"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "πεντηκωστής"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "προτεσταντικό"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Διευθύνσεις"
@@ -26974,5 +27061,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Επεξεργασία διεύθυνσης"
@@ -26980,5 +27067,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Αριθμός σπιτιού"
@@ -26986,25 +27073,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Όνομα Σπιτιού"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Όνομα οδού"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Όνομα πόλης"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Ταχυδρομικός Κώδικας"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Κωδικός χώρας"
@@ -27013,5 +27100,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων"
@@ -27019,61 +27106,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Τρόπος Αρίθμησης"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "Μονά"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "Ζυγά"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Πύργος"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Επεξεργασία Πύργου"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -27081,25 +27168,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Υδραγωγείο"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Επεξεργασία Υδραγωγείου"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Μετρητής Αερίου"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Επεξεργασία Μετρητή Αερίου"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Φάρος"
@@ -27107,10 +27194,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Ανεμόμυλος"
@@ -27118,10 +27205,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Επεξεργασία Ανεμόμυλου"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Αγωγός"
@@ -27130,41 +27217,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Επεξεργασία Αγωγού"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "Αέριο"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Θέση"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Βιολογικός Καθαρισμός"
@@ -27174,10 +27261,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Επεξεργασία Βιολογικού Καθαρισμού"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Γερανός"
@@ -27185,5 +27272,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Επεξεργασία Γερανού"
@@ -27191,10 +27278,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr ""
@@ -27202,10 +27289,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Παρακολούθηση"
@@ -27213,23 +27300,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Επεξεργασία Κάμερας Παρακολούθησης"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Γεννήτρια Ρεύματος"
@@ -27239,35 +27326,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Επεξεργασία Γεννήτριας Ρεύματος"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "Αέρας"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "Νερό"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "Πυρηνικό"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "Λιγνίτης"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "Φωτοβολταϊκό"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Σταθμός Παραγωγής Ρεύματος"
@@ -27276,10 +27363,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Υποσταθμός Ρεύματος"
@@ -27288,5 +27375,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Επεξεργασία Υποσταθμού Ρεύματος"
@@ -27294,10 +27381,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Πυλώνας Ρεύματος"
@@ -27308,23 +27395,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Επεξεργασία Πυλώνα Ρεύματος"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Αγωγός Μεταφοράς Ρεύματος"
@@ -27333,21 +27420,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "Αγωγός"
-
-#: build/trans_presets.java:2452
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27355,55 +27441,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "μονή"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "διπλή"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "τριπλή"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "τετραπλή"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Τουαλέτες"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Σημείωση"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Γραμματοκιβώτιο"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Τηλέφωνο"
@@ -27412,5 +27498,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Επεξεργασία Τηλεφώνου"
@@ -27418,5 +27504,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Κέρματα"
@@ -27424,5 +27510,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Χαρτονομίσματα"
@@ -27430,5 +27516,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27436,5 +27522,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Χρεωστικές Κάρτεσ"
@@ -27442,15 +27528,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Πιστωτικές Κάρτες"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Τηλεκάρτες"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Ανακύκλωση"
@@ -27459,5 +27545,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Επεξεργασία σταθμού Ανακύκλωσης"
@@ -27465,35 +27551,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Μπαταρίες"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Τενεκεδάκια"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Ρούχα"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Γυαλί"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Χαρτί"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Μέταλλα"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27501,5 +27587,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27508,31 +27594,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Υλικό"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "πέτρα"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "πλαστικό"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Χρώμα"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "μαύρο"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "καφέ"
@@ -27611,39 +27697,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "πράσινο"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "κόκκινο"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "μπλε"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "γκρι"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "λευκό"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Σύνολο Καθισμάτων"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27652,30 +27738,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Ύψος"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "χαμηλό"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "μισό"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "πλήρες"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Κρυψώνα"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Κλειδαριά"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Συντριβάνι"
@@ -27684,10 +27770,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Επεξεργασία Συντριβανίου"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Πόσιμο Νερό"
@@ -27696,10 +27782,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Επεξεργασία πόσιμου νερού"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -27708,5 +27794,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27714,5 +27800,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Βρεφοδόχος"
@@ -27720,15 +27806,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Επεξεργασία Βρεφοδόχου"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Καταστήματα"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -27736,10 +27822,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Επεξεργασία Καταστήματος"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -27748,28 +27834,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Επεξεργασία Καταστήματος Ποδηλάτων"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Επεξεργασία Supermarket"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr ""
@@ -27777,9 +27863,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Περίπτερο"
@@ -27787,27 +27873,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Επεξεργασία Περιπτέρου"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Ταξιδιωτικό Γραφείο"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Επεξεργασία Ταξιδιωτικού Γραφείου"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Κρεοπωλείο"
@@ -27815,9 +27901,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Επεξεργασία Κρεοπωλείου"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Φούρνος"
@@ -27825,9 +27911,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Επεξεργασία Φούρνου"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Ανθοπωλείο"
@@ -27835,18 +27921,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Επεξεργασία Ανθοπωλείου"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Βιολογικά"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Επεξεργασία Καταστήματος Βιολογικών"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Κάβα Ποτών"
@@ -27854,54 +27940,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Επεξεργασία Κάβας Ποτών"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Ποτά"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Υπολογιστές"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Ηλεκτρονικά"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Ηχοσυστήματα"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Έπιπλα"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Επεξεργασία Καταστήματος Επίπλων"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Είδη Κήπου"
@@ -27909,9 +27995,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Σιδηρικά"
@@ -27919,9 +28005,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -27929,54 +28015,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Χαρτικά"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Επεξεργασία Χαρτοπωλείου"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Κομμωτήριο"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Επεξεργασία Κομμωτηρίου"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Υποδήματα"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Επεξεργασία Υποδηματοπωλείου"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Παιχνίδια"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Στεγνοκαθαριστήριο"
@@ -27984,9 +28070,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Πλυντήριο"
@@ -27994,9 +28080,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Επεξεργασία πλυντηρίου"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr ""
@@ -28004,24 +28090,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Επεξεργασία Καταστήματος Αθλητικών"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Οπτικός"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Επεξεργασία Οπτικού"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Μηχάνημα Πώλησης"
@@ -28029,5 +28115,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Επεξεργασία Μηχανήματος Πώλησης"
@@ -28035,97 +28121,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Πωλούμενα Προϊόντα"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "εισιτήρια Στάθμευσης"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "φαγητό"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "ποτά"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "γλυκά"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "τσιγάρα"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "φωτογραφίες"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "τροφές ζώων"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "εφημερίδες"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "Παιχνίδια"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "Γραμματόσημα"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "Κάρτες SIM"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "κουπόνια"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "Προφυλακτικά"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Μετρητά"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Τράπεζα"
@@ -28133,14 +28219,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Επεξεργασία Τράπεζας"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "ΑΤΜ"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Συναλλακτήριο"
@@ -28148,5 +28234,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Επεξεργασία Συναλλακτηρίου"
@@ -28154,15 +28240,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Επεξεργασία ΑΤΜ"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Υγεία"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Ιατροί"
@@ -28170,18 +28256,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Επεξεργασία Ιατρών"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Οδοντίατρος"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Επεξεργασία Οδοντιάτρου"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Φαρμακείο"
@@ -28189,5 +28275,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Επεξεργασία Φαρμακείου"
@@ -28195,9 +28281,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Νοσοκομείο"
@@ -28205,10 +28291,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Επεξεργασία Νοσοκομειου"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr ""
@@ -28217,5 +28303,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28224,20 +28310,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Αριθμός Σημείου"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Όνομα Σημείου"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Αριθμός Τηλεφώνου"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)"
@@ -28245,5 +28331,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Κτηνιατρίο"
@@ -28252,64 +28338,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Επεξεργασία Κτηνιατρίου"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Γεωγραφία"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Τοποθεσίες"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Ήπειρος"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Επεξεργασία Ηπείρου"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Χώρα"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Επεξεργασία Χώρας"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Πολιτεία"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Επεξεργασία Πολιτείας"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Περιοχή"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Επεξεργασία Περιοχής"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Περιφέρεια"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Επεξεργασία Περιφέρειας"
@@ -28317,15 +28403,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Πόλη"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Επεξεργασία Πόλης"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Κωμόπολη"
@@ -28333,10 +28419,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Επεξεργασία Κωμόπολης"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Προάστιο"
@@ -28344,25 +28430,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Επεξεργασία Προαστίου"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Χωριό"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Επεξεργασία Χωριού"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Οικισμός"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Επεξεργασία Οικισμού"
@@ -28370,5 +28456,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Τοπονύμιο/Περιοχή"
@@ -28376,10 +28462,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Επεξεργασία Τοπονυμίου/Περιοχής"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Νησί"
@@ -28387,10 +28473,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Επεξεργασία Νησιού"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Νησίδα"
@@ -28398,5 +28484,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Επεξεργασία Νησίδας"
@@ -28404,5 +28490,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Είσοδος σπηλαίου"
@@ -28410,10 +28496,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Επεξεργασία εισόδου σπηλαίου"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Κορυφή"
@@ -28421,10 +28507,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Επεξεργασία κορυφής"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Παγετώνας"
@@ -28432,10 +28518,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Επεξεργασία παγετώνα"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Ηφαίστειο"
@@ -28443,70 +28529,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Επεξεργασία ηφαιστείου"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Όρια"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Εθνικό"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Επεξεργασία Εθνικού Συνόρου"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Διοικητικό"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Επεξεργασία Διοικητικού Ορίου"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Αστικό"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Επεξεργασία Αστικού Ορίου"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Πολιτικό"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Εθνικό πάρκο"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Χρήση γής"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Δένδρο"
@@ -28515,15 +28601,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Επεξεργασία δένδρου"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Βοτανικό όνομα"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Άλσος"
@@ -28532,5 +28618,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Επεξεργασία άλσους"
@@ -28538,17 +28624,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "Κωνοφόρο"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "φυλλοβόλα"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "Μικτό"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Δάσος"
@@ -28557,14 +28643,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Επεξεργασία Δάσους"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Εθνικός Δρυμός"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Επεξεργασία Εθνικού Δρυμού"
@@ -28572,25 +28658,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr ""
@@ -28598,10 +28684,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr ""
@@ -28609,5 +28695,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr ""
@@ -28615,5 +28701,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr ""
@@ -28622,45 +28708,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Χωράφι"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Επεξεργασία Χωραφιού"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Λειβάδι"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Επεξεργασία Λειβαδιού"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Αμπελώνας"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Επεξεργασία Αμπελώνα"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Κλήροι"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28668,25 +28754,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Κήπος"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Επεξεργασία Κήπου"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Γρασίδι"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -28694,10 +28780,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr ""
@@ -28705,20 +28791,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Πάρκο"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Επεξεργασία Πάρκου"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Χώρος αναψυχής"
@@ -28726,5 +28812,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Επεξεργασία χώρου αναψυχής"
@@ -28732,15 +28818,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Οικιστική περιοχή"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Επεξεργασία οικιστικής περιοχής"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Νεκροταφείο"
@@ -28748,9 +28834,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Επεξεργασία Νεκροταφείου"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Κοιμητήριο"
@@ -28758,39 +28844,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Επεξεργασία χρήσης γης κοιμητηρίου"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Βιομηχανική"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr ""
@@ -28798,15 +28884,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Στρατιωτικά"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr ""
@@ -28814,50 +28900,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Εγοτάξιο"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Επεξεργασία εργοταξίου"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "ΧΥΤΑ"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Λατομείο"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Επεξεργασία Λατομείου"
@@ -28867,5 +28953,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr ""
@@ -28877,5 +28963,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "εξωτερικός τομέας"
@@ -28883,5 +28969,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "εσωτερικός τομέας"
@@ -28889,5 +28975,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -28898,5 +28984,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -28904,36 +28990,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -28941,5 +29027,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Περιορισμός στροφής"
@@ -28948,5 +29034,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Επεξεργασία περιορισμού στροφής"
@@ -28954,34 +29040,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Περιορισμός"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "όχι_αριστερή_στροφή"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "όχι_δεξιά_στροφή"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "όχι_ευθεία"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "όχι_αναστροφή"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "μόνο_δεξιά_στροφή"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "μόνο_αριστερή_στροφή"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "μόνο_ευθεία"
@@ -28990,15 +29076,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr ""
@@ -29006,5 +29092,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Διαδρομή"
@@ -29013,5 +29099,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Επεξεργασία Διαδρομής"
@@ -29019,5 +29105,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Τύπος Διαδρομής"
@@ -29125,5 +29211,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29134,17 +29220,17 @@
 msgstr "ποδήλατο"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "λεωφορείο"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "δρόμος"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "Πορθμείο"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "σκι"
@@ -29212,5 +29298,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29220,9 +29306,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "τραμ"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "παράκαμψη"
@@ -29236,10 +29322,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "υπόγειος"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Περιγραφή συμβόλου"
@@ -29247,31 +29333,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Δίκτυο"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "προτεινόμενο"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "εναλλακτικό"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "προσωρινό"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "σύνδεση"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Χρώμα (δεκαεξαδικό)"
@@ -29280,30 +29366,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "τμήμα διαδρομής"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29530,5 +29616,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "παρωχημένο"
@@ -30181,4 +30267,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30282,11 +30376,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr ""
@@ -30799,5 +30893,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "προβλήτα"
@@ -30811,5 +30905,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "αγωγός"
@@ -30953,13 +31047,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "αναψυχή"
@@ -30973,5 +31067,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr ""
@@ -31067,10 +31161,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr ""
@@ -31172,10 +31266,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -31613,24 +31707,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -31662,6 +31756,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -31722,8 +31816,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "υγεία"
@@ -32076,26 +32170,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "κατάστημα"
@@ -32167,8 +32261,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "ξενοδοχείο"
@@ -32269,9 +32363,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "τουρισμός"
@@ -32359,9 +32453,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "ιστορικό"
@@ -32374,5 +32468,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "λατομείο"
@@ -32386,5 +32480,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "Χ.Υ.Τ.Α."
@@ -32406,5 +32500,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "λεκάνη"
@@ -32418,5 +32512,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr ""
@@ -32439,5 +32533,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr ""
@@ -32451,5 +32545,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "βιομηχανική"
@@ -32463,5 +32557,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr ""
@@ -32475,5 +32569,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr ""
@@ -32487,5 +32581,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr ""
@@ -32542,7 +32636,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "στρατιωτική"
@@ -32556,5 +32650,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "κοιμητήριο"
@@ -32567,5 +32661,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "κορυφή"
@@ -32580,5 +32674,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "παγετώνας"
@@ -32592,5 +32686,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "ηφαίστειο"
@@ -32645,8 +32739,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr ""
@@ -32660,5 +32754,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr ""
@@ -32672,5 +32766,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr ""
@@ -32684,5 +32778,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -32696,5 +32790,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "λάσπη"
@@ -32708,5 +32802,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "παραλία"
@@ -32784,8 +32878,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "διαδρομή"
@@ -32874,12 +32968,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "όριο"
@@ -33029,11 +33123,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr ""
@@ -33047,5 +33141,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33401,6 +33495,12 @@
 msgstr ""
 
-#~ msgid "Do not show again"
-#~ msgstr "Να μην εμφανιστεί ξανά"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Η επιλεγμένη διαδρομή δεν περιέχει τον επιλεγμένο κόμβο."
+#~ msgstr[1] ""
+#~ "Η επιλεγμένη διαδρομή δεν περιέχει όλους τους επιλεγμένους κόμβους."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Μοίρες Λεπτά Δεύτερα Λεπτα"
 
 #~ msgid ""
@@ -33879,7 +33979,4 @@
 #~ msgstr "YAHOO (WebKit GTK)"
 
-#~ msgid "Boat"
-#~ msgstr "Καράβι"
-
 #~ msgid "hikingmap"
 #~ msgstr "χάρτης πεζοπορίας"
@@ -33975,7 +34072,4 @@
 #~ msgstr "Άγνωστος τύπος μέλους για το \"{0}\""
 
-#~ msgid "resolved version:"
-#~ msgstr "επιλυμένη έκδοση:"
-
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
Index: applications/editors/josm/i18n/po/en_AU.po
===================================================================
--- applications/editors/josm/i18n/po/en_AU.po	(revision 22568)
+++ applications/editors/josm/i18n/po/en_AU.po	(revision 22569)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
+"POT-Creation-Date: 2010-08-04 19:03+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-07-28 09:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -231,5 +230,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -245,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -263,11 +262,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -275,20 +275,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -321,5 +321,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Merge"
@@ -389,5 +389,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -401,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -421,4 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -435,6 +436,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -446,5 +447,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -579,22 +580,22 @@
 msgstr "Downloading open changesets ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Combine Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Combine several ways into one."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Change directions?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Reverse and Combine"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -604,5 +605,5 @@
 "reverse some of them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -612,10 +613,10 @@
 "nodes)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combine {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Please select at least two ways to combine."
@@ -662,10 +663,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -803,5 +804,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -867,10 +868,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Export to GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Export the data to GPX file."
@@ -1062,5 +1063,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1492,20 +1493,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1529,5 +1530,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1538,6 +1539,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Error"
@@ -1564,5 +1565,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1570,5 +1571,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Save the current data."
@@ -1625,10 +1626,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Save As..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Save the current data to a new file."
@@ -1674,5 +1675,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1699,5 +1700,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "No, abort"
@@ -1767,18 +1768,24 @@
 msgstr[1] "Simplify Way (remove {0} nodes)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Split Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Split a way at the selected node."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "The current selection cannot be used for splitting."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "The selected nodes do not share the same way."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1786,5 +1793,5 @@
 msgstr[1] "The selected nodes are not in the middle of any way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1800,20 +1807,10 @@
 "way also."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "The selected nodes do not share the same way."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "The selected way does not contain the selected node."
-msgstr[1] "The selected way does not contain all the selected nodes."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "You must select two or more nodes to split a circular way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1823,5 +1820,5 @@
 "middle of the way.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1831,5 +1828,5 @@
 "should verify this and correct it when necessary.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1839,5 +1836,5 @@
 "this and correct it when necessary.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1987,5 +1984,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2992,22 +2989,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3153,25 +3150,25 @@
 msgstr "cannot resolve undecided conflict"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr "At least one object to delete required, got empty collection"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Delete node {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Delete way {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Delete relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3180,5 +3177,5 @@
 msgstr[1] "Delete {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3187,5 +3184,5 @@
 msgstr[1] "Delete {0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3194,5 +3191,5 @@
 msgstr[1] "Delete {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3201,5 +3198,5 @@
 msgstr[1] "Delete {0} relations"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3354,5 +3351,5 @@
 msgstr "Apply?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3427,17 +3424,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Error while getting files from directory {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Override old backup files?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Error creating cache directory: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3630,42 +3627,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Degrees Minutes Seconds"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Projected Coordinates"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "W"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3674,5 +3674,5 @@
 "Unable to add primitive {0} to the dataset because it is already included"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3851,5 +3851,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "background"
@@ -3996,5 +3996,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Do not show again (remembers choice)"
@@ -4022,5 +4022,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "railway"
@@ -4042,6 +4042,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4110,5 +4110,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "building"
@@ -4195,5 +4195,5 @@
 msgstr "Object deleted"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4294,69 +4294,69 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Open a file (any file type that can be opened with File/Open)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Launch in maximised mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Set the language"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Change the folder for all user settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4370,9 +4370,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4382,46 +4382,45 @@
 "order."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Make sure you load some data if you use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialising"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Updating plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Installing updated plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Loading early plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Loading plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Resolve"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4430,5 +4429,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4524,33 +4523,33 @@
 msgstr "Zoom out"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "scale"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "The geographic longitude at the mouse pointer."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "The name of the object at the mouse pointer."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "The geographic latitude at the mouse pointer."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "The angle between the previous and the current way segment."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "The (compass) heading of the line segment being drawn."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "The length of the new way segment being drawn."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4560,9 +4559,9 @@
 "this list with the mouse.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(no object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4578,4 +4577,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Layer ''{0}'' must be in list of layers"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Numeric"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "chinese"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Commercial"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5319,5 +5333,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "all"
@@ -5400,6 +5414,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5410,5 +5424,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5555,5 +5569,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Changesets"
@@ -5614,5 +5628,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5777,5 +5791,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5783,5 +5797,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5789,5 +5803,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5795,5 +5809,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5801,5 +5815,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5808,5 +5822,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5814,5 +5828,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5820,5 +5834,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5826,24 +5840,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5923,51 +5937,51 @@
 msgstr "Close the dialogue, do not create a new node"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Layers"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Open a list of all loaded layers."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Delete the selected layers."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Toggle visible state of the selected layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Show/Hide"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Toggle visible state of the selected layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Activate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Activate the selected layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Merge this layer into another layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Duplicate this layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Move the selected layer one row up."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Move the selected layer one row down."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Information about layer"
@@ -5977,5 +5991,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relations"
@@ -7139,6 +7153,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7186,107 +7201,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Name"
@@ -7655,5 +7670,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7742,5 +7757,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<different>"
@@ -8505,5 +8520,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Bounds"
@@ -8576,8 +8591,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Type"
@@ -8606,6 +8621,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "unknown"
@@ -8955,5 +8970,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Conflicts detected"
@@ -9023,14 +9038,15 @@
 msgstr "Warning: error header \"{0}\" did not match with an expected pattern"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Provide a brief comment for the changes you are uploading:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Enter an upload comment (min. 3 characters)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Illegal upload comment"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "Changeset id:"
@@ -9499,5 +9515,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Upload"
@@ -9519,5 +9535,5 @@
 msgstr "Initialising relations to update ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9525,60 +9541,93 @@
 msgstr "Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "Decide how to upload the data and which changeset to use"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Tags of new changeset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Apply tags to the changeset data is uploaded to"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr "Manage open changesets and select a changeset to upload to"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Configure advanced settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Upload to ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Upload Changes"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Upload the changed primitives"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Please enter a comment for this upload changeset (min. 3 characters)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Illegal upload comment"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Reverse"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Continue"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Click to return to the Upload Dialogue"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+msgid "Do not show this message again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Please enter a valid chunk size first"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Illegal chunk size"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Cancel the upload and resume editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9935,109 +9984,11 @@
 msgstr[1] "{0} objects to delete:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "gps point"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Customise line drawing"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Use global settings."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Draw lines between points for this layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Do not draw lines between points for this layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Select line drawing options"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Customise Colour"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Default"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Choose a colour"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Markers From Named Points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Named Trackpoints from {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Import Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Import not possible"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio files (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Audio markers from {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Import images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10045,5 +9996,5 @@
 msgstr "Name: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10051,5 +10002,5 @@
 msgstr "Description: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10059,23 +10010,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Timespan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Length"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Length: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10084,5 +10035,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10091,10 +10042,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10104,21 +10055,21 @@
 "<br>If you want to upload traces, look here:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Converted from: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10126,10 +10077,10 @@
 msgstr "Download from OSM along this track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Download everything within:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10137,10 +10088,10 @@
 msgstr "{0} metres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximum area per request:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10148,21 +10099,21 @@
 msgstr "{0} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10174,9 +10125,9 @@
 "wish<br>to continue?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "No GPX track available in layer to associate audio with."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10186,5 +10137,5 @@
 "the end were omitted or moved to the start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10194,23 +10145,121 @@
 "time were omitted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Customise line drawing"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Use global settings."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Draw lines between points for this layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Do not draw lines between points for this layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Select line drawing options"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Customise Colour"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Default"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Choose a colour"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Markers From Named Points"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Named Trackpoints from {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Import Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Import not possible"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio files (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Audio markers from {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Import images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Data Layer {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "outside downloaded area"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10219,11 +10268,11 @@
 msgstr[1] "There were {0} conflicts detected."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Click to close this dialogue and continue editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10232,36 +10281,36 @@
 msgstr[1] "{0} deleted"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consists of:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "unset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "API version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Convert to GPX layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Dataset consistency test"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "No problems found"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Following problems found:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10271,5 +10320,5 @@
 "<br>If you want to upload traces, look here:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10278,5 +10327,5 @@
 msgstr[1] "tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10284,5 +10333,5 @@
 msgstr[1] "points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10291,5 +10340,5 @@
 msgstr[1] "a track with {0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10298,5 +10347,5 @@
 msgstr[1] "{0} consists of {1} tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10305,24 +10354,28 @@
 msgstr[1] "{0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Correlate to GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Files (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "File {0} is loaded yet under the name \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Error while parsing {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Could not read \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10334,34 +10387,34 @@
 "on the photo and select a timezone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Photo time (from exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Gps time (read from the above photo): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "I am in the timezone of: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "No date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Open another photo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchronise time from a photo of the GPS receiver"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10371,21 +10424,21 @@
 "Please use the requested format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Invalid date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<No GPX track loaded yet>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX track: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Open another GPX trace"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10393,72 +10446,72 @@
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Auto-Guess"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Manual adjust"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "Override position for: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Images with geo location in exif data ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Images that are already tagged ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Show Thumbnail images on the map"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Timezone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Correlate images with GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Correlate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Invalid timezone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Invalid offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Try Again"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "No images could be matched!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "No gpx selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10468,20 +10521,20 @@
 msgstr[1] "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Timezone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconds: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10490,5 +10543,5 @@
 msgstr[1] "Time difference of {0} days"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10498,21 +10551,21 @@
 "adjust the sliders to manually match the photos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Matching photos to track failed"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Adjust timezone and offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "The selected photos do not contain time information."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Photos do not contain time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10522,17 +10575,17 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX Track has no time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "You should select a GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "No selected GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10543,5 +10596,5 @@
 "Expected format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10552,56 +10605,52 @@
 "Expected format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extracting GPS locations from EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Starting directory scan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "One of the selected files was null"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Read photos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Reading {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Unable to get canonical path for directory {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanning directory {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Found null file in directory {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Error while getting files from directory {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged Images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Correlate to GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10610,5 +10659,5 @@
 msgstr[1] "{0} images loaded."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10617,10 +10666,10 @@
 msgstr[1] "{0} were found to be GPS tagged."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Delete image file from disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10631,5 +10680,5 @@
 "permanently lost!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "Image file could not be deleted."
@@ -10729,9 +10778,9 @@
 msgstr "JPEG images (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10739,5 +10788,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10746,9 +10795,21 @@
 msgstr[1] "{0} consists of {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "No existing audio markers in this layer to offset from."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Toggle visible state of the marker text and icons."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Synchronise Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10756,5 +10817,5 @@
 "You need to pause audio at the moment when you hear your synchronisation cue."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10762,14 +10823,14 @@
 msgstr "Audio synchronised at point {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Unable to synchronise in layer being played."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Make Audio Marker at Play Head"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10778,16 +10839,4 @@
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr "No existing audio markers in this layer to offset from."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Toggle visible state of the marker text and icons."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11726,4 +11775,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "None"
@@ -11738,5 +11788,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "Draw a circle form HDOP value."
@@ -11839,5 +11889,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Only interesting direction hints (e.g. with oneway tag)."
@@ -11845,5 +11895,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Only on the head of a way."
@@ -11873,5 +11923,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Author"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Diesel"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "North"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11881,9 +11946,9 @@
 "layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Draw lines between raw GPS points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11893,9 +11958,9 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Maximum length for local files (metres)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11903,10 +11968,10 @@
 "Maximum length (in metres) to draw lines. Set to ''-1'' to draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Maximum length (metres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11914,10 +11979,10 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Draw direction arrows for lines, connecting GPS points."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11925,5 +11990,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11933,13 +11998,13 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Minimum distance (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Draw larger dots for the GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11949,9 +12014,9 @@
 "in Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Colours points and track segments by velocity."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11961,46 +12026,55 @@
 "capture device needs to log that information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Allows to tune the track colouring for different average speeds."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Track and Point Colouring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "Waypoint Description"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Draw direction hints for way segments."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Draw the order numbers of all segments within their way."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Draw the boundaries of data loaded from the server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Draw virtual nodes in select mode for easy way modification."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Draw the inactive data layers in a different colour."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM Data"
@@ -12386,21 +12460,26 @@
 msgstr "You have to restart JOSM for some settings to take effect."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Projection method"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Projection code"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Display coordinates as"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Projection method"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Projection code"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Layer to make measurements"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Map Projection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12979,5 +13058,5 @@
 msgstr "Add a new tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12988,49 +13067,49 @@
 "be the same as in values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "More information about this feature"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Optional Attributes:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unknown type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13040,15 +13119,15 @@
 msgstr "Could not read tagging preset source: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error parsing {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elements of type {0} are supported."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13058,17 +13137,17 @@
 msgstr[1] "Change {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Nothing selected!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Selection unsuitable!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Apply Preset"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13086,7 +13165,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Search: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -13095,17 +13173,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Search for objects."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Show localised name in selection lists"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Search: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13426,5 +13501,5 @@
 msgstr "Parsing file \"{0}\" failed"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Parse error: invalid document structure for gpx document"
@@ -15008,5 +15083,5 @@
 "<br><br>The error message is:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15297,5 +15372,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15637,41 +15712,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "Building address"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "House number:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Street Name:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Increment"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Decrement"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Numbers:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15688,25 +15763,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Set buildings size"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "Use Address dialogue"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Buildings width:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr "Length step:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15744,18 +15819,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Buildings"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Street"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15992,8 +16067,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "water"
@@ -16054,6 +16129,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "address"
@@ -16554,34 +16629,34 @@
 "Select one of them first, then retry"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Blank Layer"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS layer ({0}), {1} tile(s) loaded"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Is not vectorised."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Raster size: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "Is vectorised."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Commune bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16592,14 +16667,14 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Cache Format Error"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 msgid "Cache Lambert Zone Error"
 msgstr "Cache Lambert Zone Error"
@@ -16679,22 +16754,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Download object..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Download map data on the end of selected way"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Download now"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16704,12 +16775,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Test {0}/{1}: Starting {2}"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Error parsing {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16740,9 +16811,9 @@
 msgstr "Create duplicate way"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Layer for editing GPX tracks"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convert to GPX layer with anonymised time"
@@ -16752,5 +16823,5 @@
 msgstr "EditGpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "edit gpx tracks"
@@ -16759,11 +16830,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Import path from GPX layer"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Drop existing path"
@@ -16773,5 +16844,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "No GPX data layer found."
@@ -16781,13 +16852,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -17029,5 +17100,5 @@
 msgstr "Display non-geotagged photos"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Imported Images"
@@ -17383,8 +17454,6 @@
 msgstr "Open the measurement window."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Reset"
@@ -17415,5 +17484,5 @@
 msgstr "Angle between two selected Nodes"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Layer to make measurements"
@@ -17505,5 +17574,5 @@
 msgstr "OpenStreetBugs download loop"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Displays OpenStreetBugs issues"
@@ -17574,13 +17643,13 @@
 msgstr "Queue"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "offline"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "online"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17697,95 +17766,95 @@
 msgstr "Firefox executable"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "Read error!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "Write error!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "Write coordinates to image header"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 "Write position information into the exif header of the following files:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "settings"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "keep backup files"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "change file modification time:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "to gps time"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "to previous value (unchanged mtime)"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr "Photo Geotagging Plug-in"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "Writing position information to image files..."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "Could not read mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "Could not write mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "File could not be deleted!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "Could not rename file!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr "<html><h3>There are old backup files in the image directory!</h3>"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "Override old backup files?"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "Keep old backups and continue"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "Override"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "Could not delete temporary file!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "Test failed: Could not read mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "Test failed: Could not write mtime."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "Write coordinates to image header"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -17826,9 +17895,9 @@
 msgstr "New picture layer from file..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "Image not created properly."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "Could not find the map object."
@@ -18006,20 +18075,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "Merged version"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "confirm all Remote Control actions manually"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "A plug-in that allows JOSM to be controlled from other applications."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Settings for the Remote Control plug-in."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18031,50 +18105,58 @@
 "talking to the plug-in."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Permitted actions"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control has been asked to load data from the API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Do you want to allow this?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Confirm Remote Control action"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr "Remote Control has been asked to create a new node."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control has been asked to import data from the following URL:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -18082,5 +18164,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr ""
@@ -18279,41 +18361,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Load Tile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "Show Tile Info"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Load All Tiles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Increase zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Decrease zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "Snap to tile size"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "image "
@@ -18614,4 +18696,14 @@
 msgid "Terrace"
 msgstr "Terrace"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Separator"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19298,6 +19390,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19307,9 +19399,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -19388,6 +19480,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19395,5 +19487,5 @@
 msgstr "Validation errors"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "No validation errors"
@@ -19636,32 +19728,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Merge duplicate node?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Duplicated nodes"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Duplicated nodes"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Merge duplicate node?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Duplicated nodes"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Merge duplicate node?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19700,5 +19786,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20226,5 +20312,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "area"
@@ -20360,10 +20446,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -20511,10 +20597,10 @@
 msgstr "Could not read information from walking-papers.org the id \"{0}\""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20718,28 +20804,24 @@
 "This may lead to wrong coordinates."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automatic downloading"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, 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:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(deactivated)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20754,17 +20836,17 @@
 "tiles anyway?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Yes, fetch images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "Invalid URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20772,48 +20854,52 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Error loading file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Set WMS Bookmark"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automatic downloading"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20892,5 +20978,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20927,5 +21013,5 @@
 msgstr "Audio Device Unavailable"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20946,5 +21032,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "forest"
@@ -20957,78 +21043,67 @@
 #. relation type
 #: build/specialmessages.java:17
-#, fuzzy
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr "create an associatedStreet relation"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "boundary"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Increment"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "line"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Multipolygon"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Network"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "public transport"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Restriction"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "route"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "site"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "waterway"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -21312,7 +21387,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Download from OSM along this track"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -21537,6 +21611,11 @@
 msgstr "Make terraced houses out of single blocks."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21545,5 +21624,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21554,5 +21633,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21561,10 +21640,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21575,5 +21654,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21583,5 +21662,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21592,15 +21671,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21611,5 +21690,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21743,5 +21822,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Reference"
@@ -22280,5 +22359,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "metal"
@@ -22291,5 +22370,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "wood"
@@ -22593,9 +22672,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "yes"
@@ -22705,9 +22784,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "no"
@@ -22966,5 +23045,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "residential"
@@ -23013,5 +23092,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "service"
@@ -23046,5 +23125,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "construction"
@@ -23131,5 +23210,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "hiking"
@@ -23164,5 +23243,5 @@
 msgstr "good"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "intermediate"
@@ -23332,14 +23411,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operator"
@@ -23607,6 +23686,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Elevation"
@@ -24054,5 +24133,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marsh"
@@ -24458,5 +24537,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Voltage"
@@ -24820,31 +24899,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Opening Hours"
@@ -24904,90 +24983,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
@@ -25100,7 +25179,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Reference number"
@@ -25116,5 +25195,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "underground"
@@ -25127,6 +25206,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Fee"
@@ -25302,5 +25381,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -25337,6 +25416,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Shelter"
@@ -25344,5 +25423,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Bench"
@@ -25461,5 +25540,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Beacon"
@@ -25620,5 +25699,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -25626,73 +25705,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "french"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -25700,17 +25784,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "fish_and_chips"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "chicken"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Cafe"
@@ -25718,9 +25802,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub"
@@ -25728,18 +25812,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar"
@@ -25747,9 +25832,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -25757,24 +25842,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museum"
@@ -25782,9 +25867,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -25793,9 +25878,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -25803,24 +25888,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Theme Park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Artwork"
@@ -25828,5 +25913,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Edit Artwork"
@@ -25834,19 +25919,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Information Office"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Detail Grade"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "topo"
@@ -25884,5 +25969,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25890,28 +25975,28 @@
 msgstr "street"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "scheme"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Shown Area"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "site"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "city"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Closer Description"
@@ -25921,5 +26006,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Routes shown for:"
@@ -25927,5 +26012,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Hiking"
@@ -25933,6 +26018,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Cycling"
@@ -25940,5 +26025,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -25946,6 +26031,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Skiing"
@@ -25953,5 +26038,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Riding"
@@ -25959,46 +26044,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "... other transportation modes possible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Board Content"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "notice"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "wildlife"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "plants"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Guidepost"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "pole"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Information Terminal"
@@ -26006,29 +26099,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Closer description"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide via mobile phone?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Phone number"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -26036,25 +26129,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Castle"
@@ -26063,19 +26156,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -26084,9 +26177,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -26094,10 +26187,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Palaeontological Site"
@@ -26105,5 +26198,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Edit Palaeontological Site"
@@ -26111,15 +26204,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Memorial"
@@ -26127,55 +26220,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Boundary Stone"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Edit Boundary Stone"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Playground"
@@ -26183,35 +26276,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -26225,6 +26318,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "select sport:"
@@ -26640,31 +26733,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "sport"
@@ -26674,240 +26767,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -26949,23 +27042,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "type"
@@ -27007,211 +27100,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "track"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Archery"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -27219,52 +27312,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Shooting"
@@ -27272,204 +27365,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Man-Made"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Building"
@@ -27477,5 +27570,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Public Building"
@@ -27483,10 +27576,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Town hall"
@@ -27494,10 +27587,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Embassy"
@@ -27505,10 +27598,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -27517,10 +27610,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Prison"
@@ -27529,10 +27622,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Police"
@@ -27542,10 +27635,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -27554,10 +27647,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Post Office"
@@ -27565,5 +27658,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -27571,15 +27664,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "School"
@@ -27587,10 +27680,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "University"
@@ -27598,10 +27691,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "College"
@@ -27609,5 +27702,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Edit College"
@@ -27615,5 +27708,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Cinema"
@@ -27622,10 +27715,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Library"
@@ -27634,9 +27727,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -27644,10 +27737,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Theatre"
@@ -27656,10 +27749,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -27669,5 +27762,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -27676,6 +27769,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religion"
@@ -27684,66 +27777,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Denomination"
@@ -27752,81 +27845,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Addresses"
@@ -27835,5 +27928,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -27841,5 +27934,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "House number"
@@ -27847,25 +27940,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "House name"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Street name"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "City name"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Country code"
@@ -27874,5 +27967,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -27880,61 +27973,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Works"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Tower"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Tower type"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Height (metres)"
@@ -27942,25 +28035,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -27968,10 +28061,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Windmill"
@@ -27979,10 +28072,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -27991,41 +28084,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "heat"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "oil"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "sewage"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "any substance"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Location"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "underwater"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "overground"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -28035,10 +28128,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Crane"
@@ -28046,5 +28139,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Edit Crane"
@@ -28052,10 +28145,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -28063,10 +28156,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -28074,23 +28167,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "indoor"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "outdoor"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -28100,35 +28193,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Power Station"
@@ -28137,10 +28230,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -28149,5 +28242,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -28155,10 +28248,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -28169,23 +28262,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "tower"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "pole"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Tower reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Power Line"
@@ -28194,78 +28287,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Line type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "line"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "minor_line"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Amount of Cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Number of wires (better: conductors) per power cable"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "single"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Toilets"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "limited"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telephone"
@@ -28274,5 +28365,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -28280,5 +28371,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Coins"
@@ -28286,5 +28377,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Notes"
@@ -28292,5 +28383,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -28298,5 +28389,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -28304,15 +28395,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Recycling"
@@ -28321,5 +28412,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -28327,35 +28418,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Waste Basket"
@@ -28363,5 +28454,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Edit Waste Basket"
@@ -28370,31 +28461,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "stone"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plastic"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Colour"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "black"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "brown"
@@ -28473,39 +28564,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "green"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "blue"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "gray"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "white"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Amount of Seats"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -28514,30 +28605,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Fountain"
@@ -28546,10 +28637,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -28558,10 +28649,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Fire Hydrant"
@@ -28570,5 +28661,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Edit Fire Hydrant"
@@ -28576,5 +28667,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -28582,15 +28673,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Car Dealer"
@@ -28598,10 +28689,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Edit Car Shop"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Bike Dealer"
@@ -28610,28 +28701,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Edit Bicycle Shop"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Chemist"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Edit Chemist"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -28639,9 +28730,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -28649,27 +28740,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Book Store"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Edit Book Store"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Travel Agency"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Edit Travel Agency"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Butcher"
@@ -28677,9 +28768,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Edit Butcher"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Baker"
@@ -28687,9 +28778,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Edit Baker"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Florist"
@@ -28697,18 +28788,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Edit Florist"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Organic"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Edit Organic Shop"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Alcohol"
@@ -28716,54 +28807,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Edit Alcohol Shop"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Beverages"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Edit Beverages Shop"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Edit Computer Shop"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Electronics"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Edit Electronics Shop"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Edit Hifi Shop"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Furniture"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Edit Furniture Shop"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Garden Centre"
@@ -28771,9 +28862,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Edit Garden Centre"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Hardware"
@@ -28781,9 +28872,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Edit Hardware Store"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Do-it-yourself-store"
@@ -28791,54 +28882,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Edit Do-it-yourself-store"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Stationery"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Edit Stationery Shop"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Hairdresser"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Edit Hairdresser"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Shoes"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Edit Shoe Shop"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Toys"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Edit Toy Shop"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Edit Video Shop"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Dry Cleaning"
@@ -28846,9 +28937,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Edit Dry Cleaning"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Laundry"
@@ -28856,9 +28947,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Edit Laundry"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -28866,24 +28957,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Edit Outdoor Shop"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Edit Sports Shop"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Optician"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Edit Optician"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -28891,5 +28982,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -28897,97 +28988,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Bank"
@@ -28995,14 +29086,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Edit Bank"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -29010,5 +29101,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -29016,15 +29107,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Doctors"
@@ -29032,18 +29123,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -29051,5 +29142,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -29057,9 +29148,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Dispensing"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Hospital"
@@ -29067,10 +29158,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -29079,5 +29170,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -29086,20 +29177,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Phone Number"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -29107,5 +29198,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -29114,64 +29205,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geography"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Places"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Country"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Edit Country"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "State"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "County"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Edit County"
@@ -29179,15 +29270,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "City"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Town"
@@ -29195,10 +29286,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Suburb"
@@ -29206,25 +29297,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -29232,5 +29323,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Locality"
@@ -29238,10 +29329,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Island"
@@ -29249,10 +29340,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Edit Island"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Islet"
@@ -29260,5 +29351,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Edit Islet"
@@ -29266,5 +29357,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -29272,10 +29363,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Peak"
@@ -29283,10 +29374,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Glacier"
@@ -29294,10 +29385,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Volcano"
@@ -29305,70 +29396,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Political"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "National park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Tree"
@@ -29377,15 +29468,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Wood"
@@ -29394,5 +29485,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -29400,17 +29491,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Forest"
@@ -29419,14 +29510,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -29434,25 +29525,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Scree"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Fell"
@@ -29460,10 +29551,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Edit Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Heath"
@@ -29471,5 +29562,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Edit Heath"
@@ -29477,5 +29568,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -29484,45 +29575,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -29530,25 +29621,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Garden"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Grass"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Village Green"
@@ -29556,10 +29647,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Common"
@@ -29567,20 +29658,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -29588,5 +29679,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -29594,15 +29685,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -29610,9 +29701,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -29620,39 +29711,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Retail"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Railway land"
@@ -29660,15 +29751,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Military"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -29676,50 +29767,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
@@ -29729,5 +29820,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -29739,5 +29830,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "outer segment"
@@ -29745,5 +29836,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "inner segment"
@@ -29751,5 +29842,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -29760,5 +29851,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -29766,36 +29857,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29803,5 +29894,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -29810,5 +29901,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -29816,34 +29907,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -29852,15 +29943,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "to way"
@@ -29868,5 +29959,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Route"
@@ -29875,5 +29966,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -29881,5 +29972,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Route type"
@@ -29987,5 +30078,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29996,17 +30087,17 @@
 msgstr "bicycle"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "ski"
@@ -30074,5 +30165,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30082,9 +30173,9 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "detour"
@@ -30098,10 +30189,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -30109,31 +30200,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Route state"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -30142,30 +30233,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -30392,5 +30483,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "deprecated"
@@ -31043,4 +31134,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -31144,11 +31243,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "manmade"
@@ -31661,5 +31760,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "pier"
@@ -31673,5 +31772,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "pipeline"
@@ -31815,13 +31914,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "leisure"
@@ -31835,5 +31934,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "marina"
@@ -31929,10 +32028,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "amenity"
@@ -32034,10 +32133,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "amenity_traffic"
@@ -32475,24 +32574,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "amenity_light"
@@ -32524,6 +32623,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "light_water"
@@ -32584,8 +32683,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "health"
@@ -32938,26 +33037,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "shop"
@@ -33029,8 +33128,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -33131,9 +33230,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "tourism"
@@ -33221,9 +33320,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "historic"
@@ -33236,5 +33335,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "quarry"
@@ -33248,5 +33347,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "landfill"
@@ -33268,5 +33367,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "basin"
@@ -33280,5 +33379,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "farmyard"
@@ -33301,5 +33400,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "retail"
@@ -33313,5 +33412,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "industrial"
@@ -33325,5 +33424,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "brownfield"
@@ -33337,5 +33436,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "greenfield"
@@ -33349,5 +33448,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "railland"
@@ -33404,7 +33503,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "military"
@@ -33418,5 +33517,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "cemetery"
@@ -33429,5 +33528,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "peak"
@@ -33442,5 +33541,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "glacier"
@@ -33454,5 +33553,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "volcano"
@@ -33507,8 +33606,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "natural"
@@ -33522,5 +33621,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "scrub"
@@ -33534,5 +33633,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "heath"
@@ -33546,5 +33645,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "woodarea"
@@ -33558,5 +33657,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "mud"
@@ -33570,5 +33669,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "beach"
@@ -33646,8 +33745,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "route"
@@ -33736,12 +33835,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "boundary"
@@ -33891,11 +33990,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "place"
@@ -33909,5 +34008,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "tiger_data"
@@ -34263,6 +34362,18 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "closedway"
-#~ msgstr "closed way"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "The selected way does not contain the selected node."
+#~ msgstr[1] "The selected way does not contain all the selected nodes."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Degrees Minutes Seconds"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Enter an upload comment (min. 3 characters)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Please enter a comment for this upload changeset (min. 3 characters)"
 
 #~ msgid ""
@@ -34492,4 +34603,7 @@
 #~ msgstr "Create non-audio markers when reading GPX."
 
+#~ msgid "closedway"
+#~ msgstr "closed way"
+
 #~ msgid ""
 #~ "Automaticly select first WMS layer when grabing if multiple layers exist."
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 22568)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 22569)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
 "PO-Revision-Date: 2010-05-16 13:46+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-07-28 09:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 17:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -26,5 +26,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -55,14 +55,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -79,9 +78,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -124,6 +123,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -162,5 +161,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -234,5 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -248,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -266,11 +265,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -278,20 +278,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -324,5 +324,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Merge"
@@ -392,5 +392,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -404,5 +404,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -424,4 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -438,6 +439,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -449,5 +450,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -582,22 +583,22 @@
 msgstr "Downloading open changesets ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Combine Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Combine several ways into one."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Change directions?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Reverse and Combine"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -607,5 +608,5 @@
 "reverse some of them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -615,10 +616,10 @@
 "nodes)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combine {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Please select at least two ways to combine."
@@ -665,10 +666,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -806,5 +807,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -870,10 +871,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Export to GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Export the data to GPX file."
@@ -1065,5 +1066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1495,20 +1496,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1532,5 +1533,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1541,6 +1542,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Error"
@@ -1567,5 +1568,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1573,5 +1574,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Save the current data."
@@ -1628,10 +1629,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Save As..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Save the current data to a new file."
@@ -1677,5 +1678,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1702,5 +1703,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "No, abort"
@@ -1770,18 +1771,24 @@
 msgstr[1] "Simplify Way (remove {0} nodes)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Split Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Split a way at the selected node."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "The current selection cannot be used for splitting."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "The selected nodes do not share the same way."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1789,5 +1796,5 @@
 msgstr[1] "The selected nodes are not in the middle of any way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1803,20 +1810,10 @@
 "way also."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "The selected nodes do not share the same way."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "The selected way does not contain the selected node."
-msgstr[1] "The selected way does not contain all the selected nodes."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "You must select two or more nodes to split a circular way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1826,5 +1823,5 @@
 "middle of the way.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1834,5 +1831,5 @@
 "should verify this and correct it when necessary.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1842,5 +1839,5 @@
 "this and correct it when necessary.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1990,5 +1987,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2995,22 +2992,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3156,25 +3153,25 @@
 msgstr "cannot resolve undecided conflict"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr "At least one object to delete required, got empty collection"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Delete node {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Delete way {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Delete relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3183,5 +3180,5 @@
 msgstr[1] "Delete {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3190,5 +3187,5 @@
 msgstr[1] "Delete {0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3197,5 +3194,5 @@
 msgstr[1] "Delete {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3204,5 +3201,5 @@
 msgstr[1] "Delete {0} relations"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3357,5 +3354,5 @@
 msgstr "Apply?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3430,17 +3427,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Error while getting files from directory {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Override old backup files?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Error creating cache directory: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3633,42 +3630,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Degrees Minutes Seconds"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Projected Coordinates"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "W"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3677,5 +3677,5 @@
 "Unable to add primitive {0} to the dataset because it is already included"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3854,5 +3854,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "background"
@@ -3999,5 +3999,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Do not show again (remembers choice)"
@@ -4025,5 +4025,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "railway"
@@ -4045,6 +4045,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4113,5 +4113,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "building"
@@ -4198,5 +4198,5 @@
 msgstr "Object deleted"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4297,69 +4297,69 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Open a file (any file type that can be opened with File/Open)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Launch in maximised mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Set the language"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Change the folder for all user settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4373,9 +4373,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4385,46 +4385,45 @@
 "order."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Make sure you load some data if you use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialising"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Updating plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Installing updated plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Loading early plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Loading plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Resolve"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4433,5 +4432,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4527,33 +4526,33 @@
 msgstr "Zoom out"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "scale"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "The geographic longitude at the mouse pointer."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "The name of the object at the mouse pointer."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "The geographic latitude at the mouse pointer."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "The angle between the previous and the current way segment."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "The (compass) heading of the line segment being drawn."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "The length of the new way segment being drawn."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4563,9 +4562,9 @@
 "this list with the mouse.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(no object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4581,4 +4580,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Layer ''{0}'' must be in list of layers"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Numeric"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "chinese"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Commercial"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5322,5 +5336,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "all"
@@ -5403,6 +5417,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5413,5 +5427,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5558,5 +5572,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Changesets"
@@ -5617,5 +5631,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5780,5 +5794,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5786,5 +5800,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5792,5 +5806,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5798,5 +5812,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5804,5 +5818,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5811,5 +5825,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5817,5 +5831,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5823,5 +5837,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5829,24 +5843,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5926,51 +5940,51 @@
 msgstr "Close the dialogue, do not create a new node"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Layers"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Open a list of all loaded layers."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Delete the selected layers."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Toggle visible state of the selected layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Show/Hide"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Toggle visible state of the selected layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Activate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Activate the selected layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Merge this layer into another layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Duplicate this layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Move the selected layer one row up."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Move the selected layer one row down."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Information about layer"
@@ -5980,5 +5994,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relations"
@@ -7142,6 +7156,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7189,107 +7204,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Name"
@@ -7666,5 +7681,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7753,5 +7768,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<different>"
@@ -8516,5 +8531,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Bounds"
@@ -8587,8 +8602,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Type"
@@ -8617,6 +8632,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "unknown"
@@ -8966,5 +8981,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Conflicts detected"
@@ -9034,14 +9049,15 @@
 msgstr "Warning: error header \"{0}\" did not match with an expected pattern"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Provide a brief comment for the changes you are uploading:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Enter an upload comment (min. 3 characters)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Illegal upload comment"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "Changeset id:"
@@ -9510,5 +9526,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Upload"
@@ -9530,5 +9546,5 @@
 msgstr "Initialising relations to update ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9536,60 +9552,94 @@
 msgstr "Settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "Decide how to upload the data and which changeset to use"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Tags of new changeset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Apply tags to the changeset data is uploaded to"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr "Manage open changesets and select a changeset to upload to"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Configure advanced settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Upload to ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Upload Changes"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Upload the changed primitives"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Please enter a comment for this upload changeset (min. 3 characters)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Illegal upload comment"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Reverse"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Continue"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Cancel and return to editor"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Do not show again"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Please enter a valid chunk size first"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Illegal chunk size"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Cancel the upload and resume editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9946,109 +9996,11 @@
 msgstr[1] "{0} objects to delete:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "gps point"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Customise line drawing"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Use global settings."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Draw lines between points for this layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Do not draw lines between points for this layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Select line drawing options"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Customise Colour"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Default"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Choose a colour"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Markers From Named Points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Named Trackpoints from {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Import Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Import not possible"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio files (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Audio markers from {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Import images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10056,5 +10008,5 @@
 msgstr "Name: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10062,5 +10014,5 @@
 msgstr "Description: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10070,23 +10022,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Timespan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Length"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Length: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10095,5 +10047,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10102,10 +10054,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10115,21 +10067,21 @@
 "<br>If you want to upload traces, look here:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Converted from: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10137,10 +10089,10 @@
 msgstr "Download from OSM along this track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Download everything within:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10148,10 +10100,10 @@
 msgstr "{0} metres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximum area per request:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10159,21 +10111,21 @@
 msgstr "{0} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10185,9 +10137,9 @@
 "wish<br>to continue?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "No GPX track available in layer to associate audio with."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10197,5 +10149,5 @@
 "the end were omitted or moved to the start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10205,23 +10157,121 @@
 "time were omitted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Customise line drawing"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Use global settings."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Draw lines between points for this layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Do not draw lines between points for this layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Select line drawing options"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Customise Colour"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Default"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Choose a colour"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Markers From Named Points"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Named Trackpoints from {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Import Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Import not possible"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio files (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Audio markers from {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Import images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Data Layer {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "outside downloaded area"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10230,11 +10280,11 @@
 msgstr[1] "There were {0} conflicts detected."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Click to close this dialogue and continue editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10243,36 +10293,36 @@
 msgstr[1] "{0} deleted"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consists of:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "unset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "API version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Convert to GPX layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Dataset consistency test"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "No problems found"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Following problems found:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10282,5 +10332,5 @@
 "<br>If you want to upload traces, look here:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10289,5 +10339,5 @@
 msgstr[1] "tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10295,5 +10345,5 @@
 msgstr[1] "points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10302,5 +10352,5 @@
 msgstr[1] "a track with {0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10309,5 +10359,5 @@
 msgstr[1] "{0} consists of {1} tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10316,24 +10366,28 @@
 msgstr[1] "{0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Correlate to GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Files (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "File {0} is loaded yet under the name \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Error while parsing {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Could not read \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10345,34 +10399,34 @@
 "on the photo and select a timezone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Photo time (from exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Gps time (read from the above photo): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "I am in the timezone of: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "No date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Open another photo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchronise time from a photo of the GPS receiver"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10382,21 +10436,21 @@
 "Please use the requested format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Invalid date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<No GPX track loaded yet>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX track: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Open another GPX trace"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10404,72 +10458,72 @@
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Auto-Guess"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Manual adjust"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "Override position for: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Images with geo location in exif data ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Images that are already tagged ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Show Thumbnail images on the map"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Timezone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Correlate images with GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Correlate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Invalid timezone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Invalid offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Try Again"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "No images could be matched!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "No gpx selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10479,20 +10533,20 @@
 msgstr[1] "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Timezone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconds: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10501,5 +10555,5 @@
 msgstr[1] "Time difference of {0} days"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10509,21 +10563,21 @@
 "adjust the sliders to manually match the photos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Matching photos to track failed"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Adjust timezone and offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "The selected photos do not contain time information."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Photos do not contain time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10533,17 +10587,17 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX Track has no time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "You should select a GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "No selected GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10554,5 +10608,5 @@
 "Expected format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10563,56 +10617,52 @@
 "Expected format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extracting GPS locations from EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Starting directory scan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "One of the selected files was null"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Read photos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Reading {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Unable to get canonical path for directory {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanning directory {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Found null file in directory {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Error while getting files from directory {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged Images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Correlate to GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10621,5 +10671,5 @@
 msgstr[1] "{0} images loaded."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10628,10 +10678,10 @@
 msgstr[1] "{0} were found to be GPS tagged."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Delete image file from disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10642,5 +10692,5 @@
 "permanently lost!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "Image file could not be deleted."
@@ -10740,9 +10790,9 @@
 msgstr "JPEG images (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10750,5 +10800,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10757,9 +10807,21 @@
 msgstr[1] "{0} consists of {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "No existing audio markers in this layer to offset from."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Toggle visible state of the marker text and icons."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Synchronise Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10767,5 +10829,5 @@
 "You need to pause audio at the moment when you hear your synchronisation cue."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10773,14 +10835,14 @@
 msgstr "Audio synchronised at point {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Unable to synchronise in layer being played."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Make Audio Marker at Play Head"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10789,16 +10851,4 @@
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr "No existing audio markers in this layer to offset from."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Toggle visible state of the marker text and icons."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11739,4 +11789,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "None"
@@ -11751,5 +11802,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "Draw a circle form HDOP value."
@@ -11852,5 +11903,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Only interesting direction hints (e.g. with oneway tag)."
@@ -11858,5 +11909,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Only on the head of a way."
@@ -11886,5 +11937,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Author"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Diesel"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Boat"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11894,9 +11960,9 @@
 "layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Draw lines between raw GPS points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11906,9 +11972,9 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Maximum length for local files (metres)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11916,10 +11982,10 @@
 "Maximum length (in metres) to draw lines. Set to ''-1'' to draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Maximum length (metres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11927,10 +11993,10 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Draw direction arrows for lines, connecting GPS points."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11938,5 +12004,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11946,13 +12012,13 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Minimum distance (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Draw larger dots for the GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11962,9 +12028,9 @@
 "in Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Colours points and track segments by velocity."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11974,46 +12040,55 @@
 "capture device needs to log that information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Allows to tune the track colouring for different average speeds."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Track and Point Colouring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "Waypoint Description"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Draw direction hints for way segments."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Draw the order numbers of all segments within their way."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Draw the boundaries of data loaded from the server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Draw virtual nodes in select mode for easy way modification."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Draw the inactive data layers in a different colour."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM Data"
@@ -12399,21 +12474,26 @@
 msgstr "You have to restart JOSM for some settings to take effect."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Projection method"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Projection code"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Display coordinates as"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Projection method"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Projection code"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Layer to make measurements"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Map Projection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12992,5 +13072,5 @@
 msgstr "Add a new tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -13001,49 +13081,49 @@
 "be the same as in values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "More information about this feature"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Optional Attributes:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unknown type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13053,15 +13133,15 @@
 msgstr "Could not read tagging preset source: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error parsing {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elements of type {0} are supported."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13071,17 +13151,17 @@
 msgstr[1] "Change {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Nothing selected!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Selection unsuitable!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Apply Preset"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13099,7 +13179,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Search: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -13108,17 +13187,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Search for objects"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Show localised name in selection lists"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Search: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13439,5 +13515,5 @@
 msgstr "Parsing file \"{0}\" failed"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Parse error: invalid document structure for gpx document"
@@ -15029,5 +15105,5 @@
 "<br><br>The error message is:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15318,5 +15394,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15658,41 +15734,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "Building address"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "House number:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Street Name:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Increment"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Decrement"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Numbers:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15709,25 +15785,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Set buildings size"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "Use Address dialogue"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Buildings width:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr "Length step:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15765,18 +15841,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Buildings"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Street"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15952,7 +16028,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
-#, fuzzy
 msgid "Use \"Tableau d''assemblage\""
-msgstr "Select Tableau d'Assemblage"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -16016,8 +16091,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "water"
@@ -16078,6 +16153,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "address"
@@ -16578,34 +16653,34 @@
 "Select one of them first, then retry"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Blank Layer"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS layer ({0}), {1} tile(s) loaded"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Is not vectorised."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Raster size: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "Is vectorised."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Commune bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16616,14 +16691,14 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Cache Format Error"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 msgid "Cache Lambert Zone Error"
 msgstr "Cache Lambert Zone Error"
@@ -16703,22 +16778,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Download object..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Download map data on the end of selected way"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Download now"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Please select at least one task to download"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16728,12 +16799,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Test {0}/{1}: Starting {2}"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Error parsing {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16764,9 +16835,9 @@
 msgstr "Create duplicate way"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Layer for editing GPX tracks"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convert to GPX layer with anonymised time"
@@ -16776,5 +16847,5 @@
 msgstr "EditGpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "edit gpx tracks"
@@ -16783,11 +16854,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Import path from GPX layer"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Drop existing path"
@@ -16797,5 +16868,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "No GPX data layer found."
@@ -16805,13 +16876,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -17053,5 +17124,5 @@
 msgstr "Display non-geotagged photos"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Imported Images"
@@ -17407,8 +17478,6 @@
 msgstr "Open the measurement window."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Reset"
@@ -17439,5 +17508,5 @@
 msgstr "Angle between two selected Nodes"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Layer to make measurements"
@@ -17529,5 +17598,5 @@
 msgstr "OpenStreetBugs download loop"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Displays OpenStreetBugs issues"
@@ -17598,13 +17667,13 @@
 msgstr "Queue"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "offline"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "online"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17721,95 +17790,95 @@
 msgstr "Firefox executable"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "Read error!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "Write error!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "Write coordinates to image header"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 "Write position information into the exif header of the following files:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "settings"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "keep backup files"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "change file modification time:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "to gps time"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "to previous value (unchanged mtime)"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr "Photo Geotagging Plug-in"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "Writing position information to image files..."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "Could not read mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "Could not write mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "File could not be deleted!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "Could not rename file!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr "<html><h3>There are old backup files in the image directory!</h3>"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "Override old backup files?"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "Keep old backups and continue"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "Override"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "Could not delete temporary file!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "Test failed: Could not read mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "Test failed: Could not write mtime."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "Write coordinates to image header"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -17850,9 +17919,9 @@
 msgstr "New picture layer from file..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "Image not created properly."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "Could not find the map object."
@@ -18030,20 +18099,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "resolved version:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "confirm all Remote Control actions manually"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "A plug-in that allows JOSM to be controlled from other applications."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Settings for the Remote Control plug-in."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18055,50 +18129,58 @@
 "talking to the plug-in."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Permitted actions"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control has been asked to load data from the API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Do you want to allow this?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Confirm Remote Control action"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr "Remote Control has been asked to create a new node."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control has been asked to import data from the following URL:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -18106,5 +18188,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Revert"
@@ -18303,41 +18385,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Load Tile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "Show Tile Info"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Load All Tiles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Increase zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Decrease zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "Snap to tile size"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "image "
@@ -18638,4 +18720,14 @@
 msgid "Terrace"
 msgstr "Terrace"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Separator"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19342,6 +19434,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19351,9 +19443,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -19432,6 +19524,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19439,5 +19531,5 @@
 msgstr "Validation errors"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "No validation errors"
@@ -19680,32 +19772,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Merge duplicate node?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Duplicated nodes"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Duplicated nodes"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Merge duplicate node?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Duplicated nodes"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Merge duplicate node?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19744,5 +19830,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20270,5 +20356,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "area"
@@ -20404,10 +20490,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -20555,10 +20641,10 @@
 msgstr "Could not read information from walking-papers.org the id \"{0}\""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20762,28 +20848,24 @@
 "This may lead to wrong coordinates."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automatic downloading"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, 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:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(deactivated)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20798,17 +20880,17 @@
 "tiles anyway?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Yes, fetch images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "Invalid URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20816,48 +20898,52 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Error loading file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Set WMS Bookmark"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automatic downloading"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20936,5 +21022,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20971,5 +21057,5 @@
 msgstr "Audio Device Unavailable"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20990,5 +21076,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "forest"
@@ -21001,78 +21087,67 @@
 #. relation type
 #: build/specialmessages.java:17
-#, fuzzy
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr "create an associatedStreet relation"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "boundary"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Increment"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "line"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Multipolygon"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Network"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "public transport"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Restriction"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "route"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "site"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "waterway"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -21356,7 +21431,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Download from OSM along this track"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -21581,6 +21655,11 @@
 msgstr "Make terraced houses out of single blocks."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21589,5 +21668,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21598,5 +21677,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21607,10 +21686,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21621,5 +21700,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21629,5 +21708,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21638,15 +21717,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 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:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21657,5 +21736,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21789,5 +21868,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Reference"
@@ -22326,5 +22405,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "metal"
@@ -22337,5 +22416,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "wood"
@@ -22639,9 +22718,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "yes"
@@ -22751,9 +22830,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "no"
@@ -23012,5 +23091,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "residential"
@@ -23059,5 +23138,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "service"
@@ -23092,5 +23171,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "construction"
@@ -23177,5 +23256,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "hiking"
@@ -23210,5 +23289,5 @@
 msgstr "good"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "intermediate"
@@ -23378,14 +23457,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operator"
@@ -23653,6 +23732,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Elevation"
@@ -24100,5 +24179,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marsh"
@@ -24504,5 +24583,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Voltage"
@@ -24866,31 +24945,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Opening Hours"
@@ -24950,90 +25029,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
@@ -25146,7 +25225,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Reference number"
@@ -25162,5 +25241,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "underground"
@@ -25173,6 +25252,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Fee"
@@ -25348,5 +25427,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -25383,6 +25462,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Shelter"
@@ -25390,5 +25469,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Bench"
@@ -25507,5 +25586,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Beacon"
@@ -25666,5 +25745,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -25672,73 +25751,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "french"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -25746,17 +25830,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "fish_and_chips"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "chicken"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Cafe"
@@ -25764,9 +25848,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub"
@@ -25774,18 +25858,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar"
@@ -25793,9 +25878,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -25803,24 +25888,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museum"
@@ -25828,9 +25913,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -25839,9 +25924,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -25849,24 +25934,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Theme Park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Artwork"
@@ -25874,5 +25959,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Edit Artwork"
@@ -25880,19 +25965,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Information Office"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Detail Grade"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "topo"
@@ -25930,5 +26015,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25936,28 +26021,28 @@
 msgstr "street"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "scheme"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Shown Area"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "site"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "city"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Closer Description"
@@ -25967,5 +26052,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Routes shown for:"
@@ -25973,5 +26058,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Hiking"
@@ -25979,6 +26064,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Cycling"
@@ -25986,5 +26071,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -25992,6 +26077,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Skiing"
@@ -25999,5 +26084,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Riding"
@@ -26005,46 +26090,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "... other transportation modes possible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Board Content"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "notice"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "wildlife"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "plants"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Guidepost"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "pole"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Information Terminal"
@@ -26052,29 +26145,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Closer description"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide via mobile phone?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Phone number"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -26082,25 +26175,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Castle"
@@ -26109,19 +26202,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -26130,9 +26223,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -26140,10 +26233,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Palaeontological Site"
@@ -26151,5 +26244,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Edit Palaeontological Site"
@@ -26157,15 +26250,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Memorial"
@@ -26173,55 +26266,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Boundary Stone"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Edit Boundary Stone"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Playground"
@@ -26229,35 +26322,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -26271,6 +26364,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "select sport:"
@@ -26686,31 +26779,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "sport"
@@ -26720,240 +26813,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -26995,23 +27088,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "type"
@@ -27053,211 +27146,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "track"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Archery"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -27265,52 +27358,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Shooting"
@@ -27318,204 +27411,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Man-Made"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Building"
@@ -27523,5 +27616,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Public Building"
@@ -27529,10 +27622,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Town hall"
@@ -27540,10 +27633,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Embassy"
@@ -27551,10 +27644,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -27563,10 +27656,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Prison"
@@ -27575,10 +27668,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Police"
@@ -27588,10 +27681,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -27600,10 +27693,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Post Office"
@@ -27611,5 +27704,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -27617,15 +27710,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "School"
@@ -27633,10 +27726,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "University"
@@ -27644,10 +27737,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "College"
@@ -27655,5 +27748,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Edit College"
@@ -27661,5 +27754,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Cinema"
@@ -27668,10 +27761,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Library"
@@ -27680,9 +27773,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -27690,10 +27783,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Theatre"
@@ -27702,10 +27795,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -27715,5 +27808,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -27722,6 +27815,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religion"
@@ -27730,66 +27823,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Denomination"
@@ -27798,81 +27891,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Addresses"
@@ -27881,5 +27974,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -27887,5 +27980,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "House number"
@@ -27893,25 +27986,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "House name"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Street name"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "City name"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Country code"
@@ -27920,5 +28013,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -27926,61 +28019,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Works"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Tower"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Tower type"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Height (metres)"
@@ -27988,25 +28081,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -28014,10 +28107,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Windmill"
@@ -28025,10 +28118,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -28037,41 +28130,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "heat"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "oil"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "sewage"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "any substance"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Location"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "underwater"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "overground"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -28081,10 +28174,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Crane"
@@ -28092,5 +28185,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Edit Crane"
@@ -28098,10 +28191,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -28109,10 +28202,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -28120,23 +28213,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "indoor"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "outdoor"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -28146,35 +28239,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Power Station"
@@ -28183,10 +28276,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -28195,5 +28288,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -28201,10 +28294,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -28215,23 +28308,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "tower"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "pole"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Tower reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Power Line"
@@ -28240,78 +28333,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Line type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "line"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "minor_line"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Amount of Cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Number of wires (better: conductors) per power cable"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "single"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Toilets"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "limited"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telephone"
@@ -28320,5 +28411,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -28326,5 +28417,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Coins"
@@ -28332,5 +28423,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Notes"
@@ -28338,5 +28429,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -28344,5 +28435,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -28350,15 +28441,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Recycling"
@@ -28367,5 +28458,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -28373,35 +28464,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Waste Basket"
@@ -28409,5 +28500,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Edit Waste Basket"
@@ -28416,31 +28507,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "stone"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plastic"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Colour"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "black"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "brown"
@@ -28519,39 +28610,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "green"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "blue"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "gray"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "white"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Amount of Seats"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -28560,30 +28651,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Fountain"
@@ -28592,10 +28683,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -28604,10 +28695,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Fire Hydrant"
@@ -28616,5 +28707,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Edit Fire Hydrant"
@@ -28622,5 +28713,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -28628,15 +28719,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Car Dealer"
@@ -28644,10 +28735,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Edit Car Shop"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Bike Dealer"
@@ -28656,28 +28747,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Edit Bicycle Shop"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Chemist"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Edit Chemist"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -28685,9 +28776,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -28695,27 +28786,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Book Store"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Edit Book Store"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Travel Agency"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Edit Travel Agency"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Butcher"
@@ -28723,9 +28814,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Edit Butcher"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Baker"
@@ -28733,9 +28824,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Edit Baker"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Florist"
@@ -28743,18 +28834,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Edit Florist"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Organic"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Edit Organic Shop"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Alcohol"
@@ -28762,54 +28853,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Edit Alcohol Shop"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Beverages"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Edit Beverages Shop"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Edit Computer Shop"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Electronics"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Edit Electronics Shop"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Edit Hifi Shop"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Furniture"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Edit Furniture Shop"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Garden Centre"
@@ -28817,9 +28908,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Edit Garden Centre"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Hardware"
@@ -28827,9 +28918,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Edit Hardware Store"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Do-it-yourself-store"
@@ -28837,54 +28928,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Edit Do-it-yourself-store"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Stationery"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Edit Stationery Shop"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Hairdresser"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Edit Hairdresser"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Shoes"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Edit Shoe Shop"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Toys"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Edit Toy Shop"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Edit Video Shop"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Dry Cleaning"
@@ -28892,9 +28983,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Edit Dry Cleaning"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Laundry"
@@ -28902,9 +28993,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Edit Laundry"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -28912,24 +29003,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Edit Outdoor Shop"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Edit Sports Shop"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Optician"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Edit Optician"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -28937,5 +29028,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -28943,97 +29034,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Bank"
@@ -29041,14 +29132,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Edit Bank"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -29056,5 +29147,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -29062,15 +29153,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Doctors"
@@ -29078,18 +29169,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -29097,5 +29188,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -29103,9 +29194,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Dispensing"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Hospital"
@@ -29113,10 +29204,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -29125,5 +29216,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -29132,20 +29223,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Phone Number"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -29153,5 +29244,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -29160,64 +29251,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geography"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Places"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Country"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Edit Country"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "State"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "County"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Edit County"
@@ -29225,15 +29316,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "City"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Town"
@@ -29241,10 +29332,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Suburb"
@@ -29252,25 +29343,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -29278,5 +29369,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Locality"
@@ -29284,10 +29375,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Island"
@@ -29295,10 +29386,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Edit Island"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Islet"
@@ -29306,5 +29397,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Edit Islet"
@@ -29312,5 +29403,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -29318,10 +29409,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Peak"
@@ -29329,10 +29420,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Glacier"
@@ -29340,10 +29431,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Volcano"
@@ -29351,70 +29442,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Political"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "National park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Tree"
@@ -29423,15 +29514,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Wood"
@@ -29440,5 +29531,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -29446,17 +29537,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Forest"
@@ -29465,14 +29556,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -29480,25 +29571,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Scree"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Fell"
@@ -29506,10 +29597,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Edit Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Heath"
@@ -29517,5 +29608,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Edit Heath"
@@ -29523,5 +29614,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -29530,45 +29621,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -29576,25 +29667,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Garden"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Grass"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Village Green"
@@ -29602,10 +29693,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Common"
@@ -29613,20 +29704,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -29634,5 +29725,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -29640,15 +29731,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -29656,9 +29747,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -29666,39 +29757,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Retail"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Railway land"
@@ -29706,15 +29797,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Military"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -29722,50 +29813,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
@@ -29775,5 +29866,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -29785,5 +29876,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "outer segment"
@@ -29791,5 +29882,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "inner segment"
@@ -29797,5 +29888,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -29806,5 +29897,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -29812,36 +29903,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29849,5 +29940,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -29856,5 +29947,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -29862,34 +29953,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -29898,15 +29989,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "to way"
@@ -29914,5 +30005,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Route"
@@ -29921,5 +30012,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -29927,5 +30018,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Route type"
@@ -30033,5 +30124,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30042,17 +30133,17 @@
 msgstr "bicycle"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "ski"
@@ -30120,5 +30211,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30128,9 +30219,9 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "detour"
@@ -30144,10 +30235,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -30155,31 +30246,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Route state"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -30188,30 +30279,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -30438,5 +30529,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "deprecated"
@@ -31089,4 +31180,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -31190,11 +31289,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "manmade"
@@ -31707,5 +31806,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "pier"
@@ -31719,5 +31818,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "pipeline"
@@ -31861,13 +31960,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "leisure"
@@ -31881,5 +31980,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "marina"
@@ -31975,10 +32074,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "amenity"
@@ -32080,10 +32179,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "amenity_traffic"
@@ -32521,24 +32620,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "amenity_light"
@@ -32570,6 +32669,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "light_water"
@@ -32630,8 +32729,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "health"
@@ -32984,26 +33083,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "shop"
@@ -33075,8 +33174,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -33177,9 +33276,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "tourism"
@@ -33267,9 +33366,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "historic"
@@ -33282,5 +33381,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "quarry"
@@ -33294,5 +33393,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "landfill"
@@ -33314,5 +33413,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "basin"
@@ -33326,5 +33425,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "farmyard"
@@ -33347,5 +33446,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "retail"
@@ -33359,5 +33458,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "industrial"
@@ -33371,5 +33470,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "brownfield"
@@ -33383,5 +33482,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "greenfield"
@@ -33395,5 +33494,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "railland"
@@ -33450,7 +33549,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "military"
@@ -33464,5 +33563,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "cemetery"
@@ -33475,5 +33574,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "peak"
@@ -33488,5 +33587,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "glacier"
@@ -33500,5 +33599,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "volcano"
@@ -33553,8 +33652,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "natural"
@@ -33568,5 +33667,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "scrub"
@@ -33580,5 +33679,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "heath"
@@ -33592,5 +33691,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "woodarea"
@@ -33604,5 +33703,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "mud"
@@ -33616,5 +33715,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "beach"
@@ -33692,8 +33791,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "route"
@@ -33782,12 +33881,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "boundary"
@@ -33937,11 +34036,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "place"
@@ -33955,5 +34054,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "tiger_data"
@@ -34309,6 +34408,18 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "closedway"
-#~ msgstr "closed way"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "The selected way does not contain the selected node."
+#~ msgstr[1] "The selected way does not contain all the selected nodes."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Degrees Minutes Seconds"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Enter an upload comment (min. 3 characters)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Please enter a comment for this upload changeset (min. 3 characters)"
 
 #~ msgid "Move"
@@ -34404,7 +34515,4 @@
 #~ msgid "their version:"
 #~ msgstr "their version:"
-
-#~ msgid "resolved version:"
-#~ msgstr "resolved version:"
 
 #~ msgid "Contacting the OSM server..."
@@ -34517,7 +34625,4 @@
 #~ msgstr "help"
 
-#~ msgid "Do not show again"
-#~ msgstr "Do not show again"
-
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -34854,7 +34959,4 @@
 #~ msgid "Motorboat"
 #~ msgstr "Motorboat"
-
-#~ msgid "Boat"
-#~ msgstr "Boat"
 
 #~ msgid "Bridleway"
@@ -35218,4 +35320,7 @@
 #~ "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 
+#~ msgid "closedway"
+#~ msgstr "closed way"
+
 #~ msgid "Remove Selected"
 #~ msgstr "Remove Selected"
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 22568)
+++ applications/editors/josm/i18n/po/es.po	(revision 22569)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-23 16:53+0000\n"
-"Last-Translator: Jose Ernesto Davila <josernestodavila@ubuntu.com>\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-08-02 08:38+0000\n"
+"Last-Translator: Emilio Gomez Fernandez <Unknown>\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-07-28 09:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -122,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -160,5 +159,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -234,5 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -248,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -266,11 +265,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -278,20 +278,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -324,5 +324,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Unir"
@@ -391,5 +391,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -403,5 +403,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -423,4 +423,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -437,6 +438,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -448,5 +449,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -581,22 +582,22 @@
 msgstr "Descargando conjunto de cambios abiertos..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Combinar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Combinar varias vías en una."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "¿Cambiar direcciones?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Invertir y combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -606,5 +607,5 @@
 "alguna de ellas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -614,10 +615,10 @@
 "única de nodos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Por favor seleccione al menos dos vías a combinar"
@@ -664,10 +665,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -808,5 +809,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -872,10 +873,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Exportar a GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Exportar los datos a archivo GPX"
@@ -1074,5 +1075,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1515,20 +1516,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1552,5 +1553,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1561,6 +1562,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Error"
@@ -1587,5 +1588,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1593,5 +1594,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Guardar los datos actuales."
@@ -1648,10 +1649,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Guardar como..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Guardar los datos actuales en un nuevo archivo."
@@ -1698,5 +1699,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1723,5 +1724,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "No, abortar"
@@ -1792,18 +1793,24 @@
 msgstr[1] "Vía simplificada (eliminados {0} nodos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Separar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Separar vía por el nodo seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "La selección actual no se puede usar para separar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Los nodos seleccionados no comparten la misma vía."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1811,5 +1818,5 @@
 msgstr[1] "Los nodos seleccionados no están en medio de ninguna vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1825,20 +1832,10 @@
 "seleccione la vía también."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Los nodos seleccionados no comparten la misma vía."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "La vía seleccionada no contiene el nodo seleccionado."
-msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Debe seleccionar dos o más nodos para dividir una vía circular."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1848,5 +1845,5 @@
 "nodos de la mitad de la vía)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1856,5 +1853,5 @@
 "rutas.<br>Debería verificar esto y corregirlo cuando sea necesario.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1864,5 +1861,5 @@
 "verificar y corregirlo cuando sea necesareo.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1959,6 +1956,6 @@
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Nodo {0} duplicado en los nodos {1}"
+msgstr[1] "Nodos {0} duplicados en los nodos {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -2010,5 +2007,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2485,5 +2482,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
 msgid "Drag play head"
-msgstr ""
+msgstr "Arrastrar para reproducir la cabecera"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
@@ -3055,22 +3052,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3217,26 +3214,26 @@
 msgstr "no se puede resolver los conflictos pendientes"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 "Se requiere al menos un objeto para borrar,  no se ha seleccionado ninguno"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Eliminar nodo {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Eliminar forma {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Eliminar relación {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3245,5 +3242,5 @@
 msgstr[1] "Eliminar {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3252,5 +3249,5 @@
 msgstr[1] "Eliminar {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3259,5 +3256,5 @@
 msgstr[1] "Eliminar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3266,5 +3263,5 @@
 msgstr[1] "Eliminar {0} relaciones"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3421,5 +3418,5 @@
 msgstr "¿Aplicar?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3492,20 +3489,20 @@
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
-msgstr ""
+msgstr "Imposible crear el archivo {0}, se utilizará otro nombre de archivo"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Error mientras se obtenían archivos del directorio {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Imposible obtener ruta apropiada para el directorio {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Error al crear directorio caché: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3703,42 +3700,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Grados minutos segundos"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Coordenadas proyectadas"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "O"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3748,5 +3748,5 @@
 "incluida"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3928,5 +3928,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "fondo"
@@ -4074,5 +4074,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "No mostrar otra vez (recordar elección)"
@@ -4100,5 +4100,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "ferrocarril"
@@ -4120,6 +4120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4188,5 +4188,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "edificio"
@@ -4273,5 +4273,5 @@
 msgstr "Objeto borrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4373,70 +4373,70 @@
 msgstr "Contraseña"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Mostrar esta ayuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Argumento de geometría standard de unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Bajar el rectángulo límite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Bajar la posición de la URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Abrir archivo (cualquier tipo de archivo que puede abrirse con Archivo/Abrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Bajar el rectángulo límite como gps en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Descargar datos GPS desde URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Seleccionar dentro de la búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Lanzar en modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Restablecer las preferencias a los valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Definir idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "opciones proporcionadas como propiedades de sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Cambiar la carpeta para todas las configuraciones de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4450,9 +4450,9 @@
 "en megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "ejemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4462,46 +4462,45 @@
 "esta orden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Hay que cargar algún dato si se usa --selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inicializar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Actualizando complementos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Instalando complementos actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Cargando los primeros complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Ajustes predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Creando la interfaz principal de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Cargando los complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+msgstr "Datos OSM sin guardar"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Resolver"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr "Restaurar"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4509,6 +4508,8 @@
 "time. Do you want to restore data?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+"JOSM encontró {0} capas de datos OSM sin guardar. Parece que la ultima vez "
+"que se utilizó JOSM este se colgó. ¿Desea restaurar lo datos?"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4604,33 +4605,33 @@
 msgstr "Reducir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "escalar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "La longitud geográfica en el puntero del ratón."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "El nombre del objeto en el puntero del ratón"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "La latitud geográfica en el puntero del ratón."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "El ángulo entre el segmento actual de vía  y el anterior."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "La dirección (brújula) del segmento de línea que se está dibujando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "La longitud del nuevo segmento de línea que se está dibujando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4641,9 +4642,9 @@
 "<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(sin objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4659,4 +4660,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "La capa ''{0}'' debe estar en la lista de capas"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Numérico"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "chino"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Oficinas"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5140,5 +5156,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:824
 msgid "Unfreeze"
-msgstr "Desconjelar"
+msgstr "Descongelar"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:825
@@ -5433,5 +5449,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "todos"
@@ -5514,6 +5530,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5524,5 +5540,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5675,5 +5691,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Modificaciones"
@@ -5737,5 +5753,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5905,5 +5921,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5911,5 +5927,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5917,5 +5933,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5923,5 +5939,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5929,5 +5945,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5936,5 +5952,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5942,5 +5958,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5948,5 +5964,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5954,24 +5970,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro activo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objetos ocultos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objetos deshabilitados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6053,51 +6069,51 @@
 msgstr "Cerrar el diálogo, no crear un nuevo nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Abrir un listado de todas las capas cargadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Suprime las capas seleccionadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Cambia estado de visibilidad de la capa seleccionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Mostrar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Cambia estado de visibilidad de la capa seleccionada."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Activar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Activa la capa selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Combina esta capa con otra"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Duplicar esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Mover la capa seleccionada una fila arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Mover la capa seleccionada una fila abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Información de capa"
@@ -6107,5 +6123,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relaciones"
@@ -7278,6 +7294,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7325,107 +7342,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Nombre"
@@ -7815,5 +7832,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7903,5 +7920,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<diferente>"
@@ -8074,6 +8091,6 @@
 msgid "Downloading {0} incomplete child of relation ''{1}''"
 msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Descargando {0} hijo incompleto de la relación \"{1}\""
+msgstr[1] "Descargando {0} hijos incompletos de la relación \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:100
@@ -8405,4 +8422,6 @@
 "current layer"
 msgstr ""
+"Los miembros pegados de la memoria intermedia no se pueden añadir porque no "
+"están incluidos en la capa actual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
@@ -8681,5 +8700,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Límites"
@@ -8752,8 +8771,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Tipo"
@@ -8782,6 +8801,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "desconocido"
@@ -8921,4 +8940,6 @@
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
+"El histórico ha se ha iniciado aún. No se pudo establecer la referencia "
+"primitiva."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
@@ -8940,4 +8961,6 @@
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
+"El histórico ha se ha iniciado aún. No se pudo establecer la referencia "
+"primitiva actual."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
@@ -9023,5 +9046,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
 msgid "Launch browser with information about the changeset"
-msgstr ""
+msgstr "Abrir el navegador con información sobre el conjunto de cambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139
@@ -9113,5 +9136,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Se han detectado conflictos"
@@ -9179,14 +9202,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Introduzca un breve comentario sobre los cambios que se van a subir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Introduzca un comentario para la subida (mínimo 3 caracteres)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Comentario de subida no válido"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "id del conjunto de cambios:"
@@ -9231,5 +9255,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:111
 msgid "Select an open changeset"
-msgstr ""
+msgstr "Seleccionar un conjunto de cambios abierto"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:145
@@ -9240,4 +9264,5 @@
 msgid "Select to close the changeset after the next upload"
 msgstr ""
+"Seleccionar para cerrar el conjunto de cambios después de la próxima subida"
 
 #. putValue(NAME, tr("Reload"));
@@ -9631,5 +9656,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Subir"
@@ -9651,5 +9676,5 @@
 msgstr "Inicializando relaciones a actualizar ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9657,18 +9682,18 @@
 msgstr "Preferencias"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "Decida cómo cargar los datos y que conjunto de cambios usar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Etiquetas del nuevo conjunto de cambios"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
@@ -9676,45 +9701,77 @@
 "cambios a subir a"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Configurar ajustes avanzados"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Subido a ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Subir cambios"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Sube las primitivas que se han cambiado"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-"Introduzca un comentario para la subida de este set de cambios (mín. 3 "
-"caracteres)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Comentario de subida no válido"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Invertir"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Continuar"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Ir a la página anterior"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "No mostrar de nuevo"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Tamaño ilegal de fragmento"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Cancelar la carga y reanudar la edición"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -10054,103 +10111,11 @@
 msgstr[1] "{0} objetos para eliminar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Personalice el dibujo de línea"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Usar las preferencias globales"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Dibujar líneas entre puntos para esta capa"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "No dibujar líneas entre puntos para esta capa"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Seleccione las opciones de dibujo de línea"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Personalizar colores"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predeterminado"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Seleccionar una color"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Marcadores desde puntos nombrados"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Puntos de traza nombrados desde {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Importar audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "No es posible importar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "archivos Wave Audio (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcadores de audio desde {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importar imágenes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10158,5 +10123,5 @@
 msgstr "Nombre: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10164,5 +10129,5 @@
 msgstr "Descripción: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10172,23 +10137,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Descripción"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Intervalo de tiempo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Longitud: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10197,5 +10162,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10204,10 +10169,10 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10217,21 +10182,21 @@
 "peligroso.<br>Si quiere subir trazas, consulte aquí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertido desde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10239,10 +10204,10 @@
 msgstr "Descargar datos de OSM a lo largo de esta traza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Descargar todo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10250,10 +10215,10 @@
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10261,21 +10226,21 @@
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10287,9 +10252,9 @@
 "<br¿Desea continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "No hay traza gpx disponible en la capa para asociar el audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10300,5 +10265,5 @@
 "comienzo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10308,23 +10273,115 @@
 "tiempos fueran razonablemente estimados se han omitido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Personalice el dibujo de línea"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Usar las preferencias globales"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Dibujar líneas entre puntos para esta capa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "No dibujar líneas entre puntos para esta capa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Seleccione las opciones de dibujo de línea"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Personalizar colores"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Seleccionar una color"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Marcadores desde puntos nombrados"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Puntos de traza nombrados desde {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Importar audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "No es posible importar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "archivos Wave Audio (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcadores de audio desde {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importar imágenes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "fuera del área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10333,11 +10390,11 @@
 msgstr[1] "Se han detectado {0} conflictos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10346,36 +10403,36 @@
 msgstr[1] "{0} eliminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} formado por:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "sin ajustar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "Versión del API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Convertir a capa de gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "No se han encontrado problemas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10383,5 +10440,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10390,5 +10447,5 @@
 msgstr[1] "trazas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10396,5 +10453,5 @@
 msgstr[1] "puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10403,5 +10460,5 @@
 msgstr[1] "una traza con {0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10410,5 +10467,5 @@
 msgstr[1] "{0} formado por las trazas {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10417,24 +10474,28 @@
 msgstr[1] "{0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Correlacionar con GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Archivos GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "El archivo {0} ya está cargado con el nombre \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Error mientras se analizaba sintácticamente {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "No se pudo leer \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10446,34 +10507,34 @@
 "lee en la foto y seleccione una zona horaria<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Hora de la foto (desde exif)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Hora del Gps (leída desde la foto tomada): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/aaaa hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Yo estoy en la zona horaria de: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Sin fecha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Abrir otra foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "sincronizar el tiempo de una foto con el receptor GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10483,93 +10544,93 @@
 "Por favor, utilice el formato requerido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Fecha no válida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<La traza GPX no está cargada aún>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "Traza GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Abrir otra traza gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Estimación automática"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Ajuste manual"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Imágenes con geolocalización en datos exif ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Mostrar imágenes en miniatura en el mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Zona horaria: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Ajuste:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Correlacionar las imágenes con la traza GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Correlación"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Zona horaria no válida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Desplazamiento inválido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Volver a intentar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10579,20 +10640,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Zona horaria: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Segundos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10601,5 +10662,5 @@
 msgstr[1] "(Diferencia de tiempo de {0} días)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10610,13 +10671,13 @@
 "manual."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Ajuste de fotografías a traza fallido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Ajustar zona horaria y la diferencia temporal"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
@@ -10624,9 +10685,9 @@
 "fueron tomadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Las fotografías no contiene información horaria"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10636,17 +10697,17 @@
 "seleccione otra."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "La traza GPX no posee información horaria"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Debe seleccionar una traza GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "No se ha seleccionado una traza GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10657,5 +10718,5 @@
 "Formato esperado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10666,56 +10727,52 @@
 "Formato esperado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrayendo localizaciones GPS del EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Iniciando escaneo del directorio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "Uno de los archivos seleccionados era nulo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Leyendo fotos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Leyendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Imposible obtener ruta apropiada para el directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Escaneando directorio {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Encontrado archivo nulo en el directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Error mientras se obtenían archivos del directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imagenes Geoetiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Correlacionar con GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10724,5 +10781,5 @@
 msgstr[1] "{0} imágenes cargadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10731,10 +10788,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Borrar archivo de imagen del disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10743,5 +10800,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "El archivo de imagen no se pudo borrar."
@@ -10841,9 +10898,9 @@
 msgstr "Imágenes JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "Marcador gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10851,5 +10908,5 @@
 msgstr[1] "marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10858,9 +10915,22 @@
 msgstr[1] "{0} consiste en los marcadores {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "No existen marcadores de audio en esta capa desde los que desplazar."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr ""
+"Interruptor de la visiblidad del estado de los marcadores de texto e iconos."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Sincronizar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10868,5 +10938,5 @@
 "Necesita pausar el audio en el momento que oiga su entrada de sincronización"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10874,14 +10944,14 @@
 msgstr "Audio sincronizado en el punto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "No se puede sincronizar en la capa que se escuchaba."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Crear un marcador de audio en la cabecera de escucha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10890,17 +10960,4 @@
 "Necesitaba haber pausado el audio en el punto de la pista donde quería el "
 "marcador."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr "No existen marcadores de audio en esta capa desde los que desplazar."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr ""
-"Interruptor de la visiblidad del estado de los marcadores de texto e iconos."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11774,4 +11831,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Ninguno"
@@ -11786,5 +11844,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "Dibujar el valor HDOP de forma circular"
@@ -11889,5 +11947,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Solo marcar direcciones de interés (ej: vías con etiqueta oneway)"
@@ -11895,5 +11953,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Solo en la cabecera de la vía."
@@ -11923,5 +11981,20 @@
 msgstr "Crear marcadores al leer GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Autor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Diesel"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Barco"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11931,9 +12004,9 @@
 "capa gpx."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11943,9 +12016,9 @@
 "Valor ''-1'' para dibujar todas las líneas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Longitud máxima de los archivos locales (en metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11954,10 +12027,10 @@
 "dibujarlas todas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Longitud máxima (en metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11966,10 +12039,10 @@
 "información de la línea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Dibujar flechas de dirección en las líneas que conectan puntos gps."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11978,5 +12051,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11985,13 +12058,13 @@
 "No dibujar flechas si no están por lo menos a esta distancia de la anterior"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima en píxeles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "dibuje grandes los puntos gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12001,9 +12074,9 @@
 "personalizado en el Gestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Colores de puntos y segmentos de trazas según velocidades."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12011,5 +12084,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12017,23 +12090,32 @@
 "medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Coloreado de traza y punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "imagen del waypoint"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Dibujar pistas de dirección para los segmentos de vía"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Dibujar los números de orden de todos los segmentos de una vía"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -12042,10 +12124,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Dibujar los límites de los datos descargados del servidor"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12054,9 +12136,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Dibujar las capas inactivas en un color diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Datos OSM"
@@ -12412,21 +12494,26 @@
 msgstr "Debes reiniciar JOSM para que las preferencias tengan efecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Método de proyección"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Código de proyección"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Visualizar las coordenadas como"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Método de proyección"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Código de proyección"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Capa para mediciones"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Proyección del mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12984,5 +13071,5 @@
 msgstr "Añadir una nueva etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12991,49 +13078,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Más información sobre esta característica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "Roles disponibles"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Atributos opcionales"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconocido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13043,15 +13130,15 @@
 msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Los elementos del tipo {0} son soportados"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13061,17 +13148,17 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "¡No hay nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "¡Selección inadecuada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Aplicar"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13089,7 +13176,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Buscar: "
+msgstr "Buscar predefinido"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -13098,17 +13184,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Búsqueda de objetos"
+msgstr "Buscar predefinidos"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Zoom a la selección"
+msgstr "La muestra sólo es aplicable a la selección"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Buscar: "
+msgstr "Buscar en etiquetas"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13407,5 +13490,5 @@
 msgstr "Análisis sintáctivo fallido del archivo \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -14900,5 +14983,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15178,5 +15261,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Interpolación de números de portales"
@@ -15530,41 +15613,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15581,25 +15664,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15637,18 +15720,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Edificios"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15811,7 +15894,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
-#, fuzzy
 msgid "Use \"Tableau d''assemblage\""
-msgstr "Seleccione tabla de montaje"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -15875,8 +15957,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "lámina de agua"
@@ -15937,6 +16019,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "dirección"
@@ -16427,34 +16509,34 @@
 "Seleccione primero una de ellas y reinténtelo"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Capa vacía"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Capa WMS ({0}), {1} tesela(s) cargada"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "No está vectorizado."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Tamaño de la imagen raster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "Está vectorizado."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Cuadro de la Comunna: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16465,14 +16547,14 @@
 "Creado uno nuevo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Error en el formato caché"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr "Error en la zona Lambert  de la caché"
@@ -16552,22 +16634,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Descargar objeto..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Descargar elementos del mapa hasta el final de la vía seleccionada"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Descargar ahora"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Por favor, seleccione al menos una tarea para descargar"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16577,12 +16655,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Test {0}/{1}: Comenzando {2}"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Error en el análisis sintáctico {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16613,9 +16691,9 @@
 msgstr "Crear un duplicado de la vía"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Capa para la edición de trazas GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convertir a capa GPX con tiempo anonimizado"
@@ -16625,5 +16703,5 @@
 msgstr "Editar GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "editar trazas GPX"
@@ -16632,11 +16710,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Importar recorrido desde la capa GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Soltar camino existente"
@@ -16646,5 +16724,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "No se encontró la capa de datos GPX"
@@ -16654,13 +16732,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16902,5 +16980,5 @@
 msgstr "Mostrar fotos sin geoetiquetar"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Imágenes importadas"
@@ -17262,8 +17340,6 @@
 msgstr "Abrir la ventana de medidas."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Reiniciar"
@@ -17295,5 +17371,5 @@
 msgstr "Ángulo entre dos nodos seleccionados"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Capa para mediciones"
@@ -17388,5 +17464,5 @@
 msgstr "Bucle de descarga de OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Mostar cuestiones de OpenStreetBug"
@@ -17459,13 +17535,13 @@
 msgstr "Cola"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "desconectado"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "conectado"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17581,93 +17657,93 @@
 msgstr "Ejecutable Firefox"
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -17709,9 +17785,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17889,21 +17965,26 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "versión resuelta:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "confirmar todas las acciones manuales de control remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 "Un componente que permite a JOSM ser controlado por otras aplicaciones."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Ajustes para el componente Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17915,50 +17996,58 @@
 "comunicarse con el complemento."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Acciones permitidas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "El control remoto ha pedido cagar datos desde el API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detalles requeridos: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "¿Desea permitir esto?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "confirmar la acción del control remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "El control remoto ha pedido importar datos de la siguiente URL:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr "Conjunto de cambios revertido en su totalidad"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
-msgstr ""
-
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+msgstr "Revertir la selección y restaurar los objetos eliminados"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17966,5 +18055,5 @@
 msgstr "Revertir conjunto de cambios"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Revertir"
@@ -18163,41 +18252,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Mapa desplazable"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Cargar tesela"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "Mostrar información de la tesela"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Cargar todas las teselas"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Incrementar zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Reducir zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "Ajustar al tamaño de la tesela"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Alinear caché de teselas"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "imagen "
@@ -18504,4 +18593,14 @@
 msgid "Terrace"
 msgstr "Edificios entre medianeras"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Separador"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18668,9 +18767,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:406
 msgid "Do you want to save anyway?"
-msgstr ""
+msgstr "¿Desea guardarlo de todos modos?"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:409
 msgid "Yes, save anyway"
-msgstr ""
+msgstr "Sí, guardarlo de todos modos"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:411
@@ -18680,5 +18779,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:415
 msgid "No, resolve issues first"
-msgstr ""
+msgstr "No, resolver primero los problemas"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:417
@@ -19225,6 +19324,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19234,9 +19333,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -19315,6 +19414,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19322,5 +19421,5 @@
 msgstr "Errores de validación"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Sin errores de validación"
@@ -19565,32 +19664,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "¿Fusionar nodos duplicados?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Nodos duplicados"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Nodos duplicados"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "¿Fusionar nodos duplicados?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Nodos duplicados"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "¿Fusionar nodos duplicados?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19629,5 +19722,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -20059,5 +20152,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:36
 msgid "This test checks if turnrestrictions are valid"
-msgstr ""
+msgstr "Esto verifica si las restrincciones de giro son válidas"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:88
@@ -20166,5 +20259,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "área"
@@ -20307,10 +20400,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -20460,10 +20553,10 @@
 msgstr "No se pudo leer la información de walking-papers.org el id \"{0}\""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20664,9 +20757,5 @@
 "Esto puede dar lugar a unas coordenadas erróneas."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Descarga automática"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -20675,19 +20764,19 @@
 "''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(desactivado)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Capa WMS ({0}), descargando en zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20702,17 +20791,17 @@
 "teselas WMS de todos modos?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Sí, descargar las imágenes"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "¿URL no válida?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Descargar las teselas visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20721,48 +20810,52 @@
 "más, o cambie la resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Cambiar resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Recargar teselas erróneas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Guardar capa WMS como archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Salvar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS desde archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Cargar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Error en el formato del archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Error al leer el archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Fijar marcador WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Descarga automática"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20846,5 +20939,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20881,5 +20974,5 @@
 msgstr "Dispositivo de audio no disponible"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20900,5 +20993,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "plantación forestal"
@@ -20917,71 +21010,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "frontera"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Incremento:"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "alta tensión"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Multipolígono"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Red"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "transporte público"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Restricción"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "ruta"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "sitio"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "vía fluvial"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -21267,7 +21350,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Descargar datos de OSM a lo largo de esta traza"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -21514,6 +21596,11 @@
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21524,5 +21611,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21533,5 +21620,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21542,10 +21629,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr "Premite desborrar un objeto de la base de datos OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21557,5 +21644,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21565,5 +21652,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21574,5 +21661,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -21580,10 +21667,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 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:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21594,5 +21681,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21727,5 +21814,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Referencia"
@@ -22264,5 +22351,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "metal"
@@ -22275,5 +22362,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "bosque"
@@ -22577,9 +22664,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "sí"
@@ -22689,9 +22776,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "no"
@@ -22950,5 +23037,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "calle urbana"
@@ -22997,5 +23084,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "vía de servicio"
@@ -23030,5 +23117,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "en construcción"
@@ -23115,5 +23202,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "senda"
@@ -23148,5 +23235,5 @@
 msgstr "buena"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "intermedia"
@@ -23316,14 +23403,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operador"
@@ -23591,6 +23678,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Altitud"
@@ -24039,5 +24126,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marísma"
@@ -24443,5 +24530,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Voltaje"
@@ -24805,31 +24892,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -24889,90 +24976,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Vie 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
@@ -25085,7 +25172,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Número de referencia"
@@ -25101,5 +25188,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "subterráneo"
@@ -25112,6 +25199,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "De pago"
@@ -25287,5 +25374,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Silla de ruedas"
@@ -25322,6 +25409,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Refugio"
@@ -25329,5 +25416,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Banco"
@@ -25446,5 +25533,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Baliza"
@@ -25605,5 +25692,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Cocina"
@@ -25611,73 +25698,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "griego"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japonés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "francés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "sandwich / emparedado"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Establecimiento de comida rápida"
@@ -25685,17 +25777,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecimiento de comida rápida"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "fish_and_chips (papas y pescado fritos)"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "pollo"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Cafetería"
@@ -25703,9 +25795,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub"
@@ -25713,18 +25805,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Editar pub"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar"
@@ -25732,9 +25825,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Discoteca"
@@ -25742,24 +25835,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Editar discoteca"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Editar atracción"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museo"
@@ -25767,9 +25860,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Editar museo"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -25778,9 +25871,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Editar zoo"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -25788,24 +25881,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Torre de vigía"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Parque temático"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Editar parque temático"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Trabajo artístico"
@@ -25813,5 +25906,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Editar trabajo artístico"
@@ -25819,19 +25912,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Oficina de información"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Grado de detalle"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "topográfico"
@@ -25869,5 +25962,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25875,28 +25968,28 @@
 msgstr "calle"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Mostrar área"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "sitio"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "ciudad"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "región"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Descripción detallada"
@@ -25906,5 +25999,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Rutas mostradas para:"
@@ -25912,5 +26005,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Sendero"
@@ -25918,6 +26011,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -25925,5 +26018,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Bicicleta de montaña"
@@ -25931,6 +26024,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Esquí"
@@ -25938,5 +26031,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Equitación"
@@ -25944,46 +26037,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "... otros modos de desplazamiento posible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Tablón de anuncios"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "aviso"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "naturaleza"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "vida salvaje"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "plantas"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Poste indicador"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "poste"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Punto de información"
@@ -25991,29 +26092,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Descripción detallada"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Audioguía"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "¿Audioguía a través de teléfono móvil?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Número de teléfono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Otros Puntos de Información"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Editar refugio"
@@ -26021,25 +26122,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Barbacoa"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Zona de picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Castillo"
@@ -26048,19 +26149,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Editar castillo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruinas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Editar ruinas"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Lugar arqueológico"
@@ -26069,9 +26170,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueológico"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -26079,10 +26180,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Editar campo de batalla"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Sitio paleontológico"
@@ -26090,5 +26191,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Editar sitio paleontológico"
@@ -26096,15 +26197,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -26112,55 +26213,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Mojón"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Editar mojón"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -26168,35 +26269,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Editando pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Deportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -26210,6 +26311,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "seleccionar deporte:"
@@ -26625,31 +26726,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "deporte"
@@ -26659,240 +26760,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "carrera de perros"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "carrera de caballos"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "patinaje"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Cancha de juego"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Editar cancha de juego"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -26934,23 +27035,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "tipo"
@@ -26992,211 +27093,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "cancha de juego"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Natación"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -27204,52 +27305,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Tiro"
@@ -27257,204 +27358,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Artificial"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Edificio"
@@ -27462,5 +27563,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Edificio público"
@@ -27468,10 +27569,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -27479,10 +27580,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Editar ayuntamiento"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Embajada"
@@ -27490,10 +27591,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Editar embajada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -27502,10 +27603,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Editar juzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Prisión"
@@ -27514,10 +27615,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Policía"
@@ -27527,10 +27628,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -27539,10 +27640,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Editar parque de bomberos"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -27550,5 +27651,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -27556,15 +27657,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Escuela"
@@ -27572,10 +27673,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Editar escuela"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Universidad"
@@ -27583,10 +27684,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Editar universidad"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -27594,5 +27695,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Editar instituto de enseñanza secundaria"
@@ -27600,5 +27701,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Cine"
@@ -27607,10 +27708,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Biblioteca"
@@ -27619,9 +27720,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -27629,10 +27730,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Teatro"
@@ -27641,10 +27742,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -27654,5 +27755,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -27661,6 +27762,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religión"
@@ -27669,66 +27770,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Confesión"
@@ -27737,81 +27838,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Direcciones"
@@ -27820,5 +27921,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Editar direcciones"
@@ -27826,5 +27927,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Número de portal"
@@ -27832,25 +27933,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Nombre del edificio"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Nombre de la calle"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Nombre de la ciudad"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Código del país"
@@ -27859,5 +27960,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Editar interpolación de números de portales"
@@ -27865,61 +27966,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "comunicación"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "observación"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Altura (en metros)"
@@ -27927,25 +28028,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Faro"
@@ -27953,10 +28054,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -27964,10 +28065,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Tubería"
@@ -27976,41 +28077,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "térmico"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "aceite"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "aguas residuales"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "cualquier sustancia"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Localización"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "sumergido"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "en superficie"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -28020,10 +28121,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Grúa"
@@ -28031,5 +28132,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Editar grúa"
@@ -28037,10 +28138,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -28048,10 +28149,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -28059,23 +28160,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "interiores"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "exteriores"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "público"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -28085,35 +28186,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -28122,10 +28223,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -28134,5 +28235,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -28140,10 +28241,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -28154,23 +28255,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "poste"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Referencia de la torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -28179,78 +28280,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Tipo de línea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "alta tensión"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "baja tensión"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Cantidad de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de alambres (mejor: conductores) por cable de tensión"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "sencillo"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "doble"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Baños"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Teléfono"
@@ -28259,5 +28358,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -28265,5 +28364,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Monedas"
@@ -28271,5 +28370,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Billetes"
@@ -28277,5 +28376,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -28283,5 +28382,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -28289,15 +28388,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -28306,5 +28405,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -28312,35 +28411,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Papeleras"
@@ -28348,5 +28447,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Editar papeleras"
@@ -28355,31 +28454,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Respaldo"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "piedra"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Color"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "negro"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "marrón"
@@ -28458,39 +28557,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "zona verde"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "blanco"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Número de asientos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
@@ -28499,30 +28598,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Oculto"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Esclusa"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Fuente"
@@ -28531,10 +28630,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -28543,10 +28642,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Hidrante contra incendios"
@@ -28555,5 +28654,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Editar hidrante contra incendios"
@@ -28561,5 +28660,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -28567,15 +28666,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Comercios"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Concesionario de automóviles"
@@ -28583,10 +28682,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Editar concesionario de automóviles"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Tienda de bicicletas"
@@ -28595,28 +28694,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Editar tienda de bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -28624,9 +28723,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Editar tienda de alimentación"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosco"
@@ -28634,27 +28733,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Editar kiosco"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Librería"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Agencia de viajes"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Editar agencia de viajes"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Carnicería"
@@ -28662,9 +28761,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Panadería"
@@ -28672,9 +28771,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Editar panadería"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Floristería"
@@ -28682,18 +28781,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Tienda de productos orgánicos"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Editar tienda de productos orgánicos"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Tienda de bebidas alcohólicas"
@@ -28701,54 +28800,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Editar tienda de bebidas alcohólicas"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Editar tienda de bebidas"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Tienda de informática"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Editar tienda de informática"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Editar tienda de electrónica"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Editar tienda Hi-Fi"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Muebles"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Editar mueblería"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Centro de jardinería"
@@ -28756,9 +28855,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Editar centro de jardinería"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Ferretería"
@@ -28766,9 +28865,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Editar ferretería"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaje"
@@ -28776,54 +28875,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaje"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Peluquería"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Editar peluquería"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Juguetes"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Editar juguetería"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Editar tienda de videos"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -28831,9 +28930,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Lavandería"
@@ -28841,9 +28940,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Editar lavandería"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Tienda de actividades al aire libre"
@@ -28851,24 +28950,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Editar tienda de actividades al aire libre"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Editar tienda de material de deportes"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Óptica"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -28876,5 +28975,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -28882,97 +28981,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Tarjetas de fidelización o descuento"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Banco"
@@ -28980,14 +29079,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -28995,5 +29094,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moneda"
@@ -29001,15 +29100,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr ""
@@ -29018,18 +29117,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Editar médicos"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -29037,5 +29136,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia/parafarmacia"
@@ -29043,9 +29142,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Expende con receta médica"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Hospital"
@@ -29053,10 +29152,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -29065,5 +29164,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -29072,20 +29171,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -29093,5 +29192,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -29100,64 +29199,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geografía"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Estado/Provincia"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Región"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Municipio"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Editar municipio"
@@ -29165,15 +29264,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -29181,10 +29280,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr ""
@@ -29194,5 +29293,5 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr ""
@@ -29201,15 +29300,15 @@
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr ""
@@ -29217,5 +29316,5 @@
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr ""
@@ -29225,5 +29324,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Paraje"
@@ -29231,10 +29330,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Isla"
@@ -29242,10 +29341,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Editar isla"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Islote"
@@ -29253,5 +29352,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Editar islote"
@@ -29259,5 +29358,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -29265,10 +29364,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cueva"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Pico"
@@ -29276,10 +29375,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Glaciar"
@@ -29287,10 +29386,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Volcán"
@@ -29298,70 +29397,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Político"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Árbol"
@@ -29370,15 +29469,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Bosque"
@@ -29387,5 +29486,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -29393,17 +29492,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Plantación forestal"
@@ -29412,14 +29511,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
@@ -29427,25 +29526,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Pedregal"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Editar pedregal"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Braña"
@@ -29453,10 +29552,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Editar braña"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -29464,5 +29563,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -29470,5 +29569,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -29477,45 +29576,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Prado"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -29523,15 +29622,15 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Jardín"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr ""
@@ -29540,10 +29639,10 @@
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Editar zonas con hierba"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -29553,10 +29652,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -29564,20 +29663,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -29585,5 +29684,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -29591,15 +29690,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Camposanto (para los cementerios próximos a las iglesias)"
@@ -29607,9 +29706,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Editar camposanto"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -29617,39 +29716,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Comercios"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -29657,15 +29756,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -29673,50 +29772,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
@@ -29726,5 +29825,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -29736,5 +29835,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "segmento exterior"
@@ -29742,5 +29841,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "segmento interior"
@@ -29748,5 +29847,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr "Frontera"
@@ -29757,5 +29856,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr "Editar frontera"
@@ -29763,36 +29862,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr "Tipo de frontera"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr "administrativa"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr "Nivel administrativo"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29800,5 +29899,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -29807,5 +29906,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -29813,34 +29912,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "solo ir recto"
@@ -29849,15 +29948,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "a través de nodo o vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "a la vía"
@@ -29865,5 +29964,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Ruta"
@@ -29872,5 +29971,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -29878,5 +29977,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Tipo de ruta"
@@ -29984,5 +30083,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29993,17 +30092,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "ski"
@@ -30071,5 +30170,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30079,9 +30178,9 @@
 msgstr "pie"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "desvío"
@@ -30095,10 +30194,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -30106,31 +30205,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -30139,30 +30238,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -30389,5 +30488,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "obsoleto"
@@ -31040,4 +31139,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -31141,11 +31248,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "hecho por el hombre"
@@ -31658,5 +31765,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "muelle"
@@ -31670,5 +31777,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "tubería"
@@ -31812,13 +31919,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "ocio"
@@ -31832,5 +31939,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "puerto deportivo"
@@ -31926,10 +32033,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "servicios"
@@ -32031,10 +32138,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "tráfico de ocio"
@@ -32472,24 +32579,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "equipamiento lumínico"
@@ -32521,6 +32628,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "agua (claro)"
@@ -32581,8 +32688,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "salud"
@@ -32935,26 +33042,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "tienda"
@@ -33026,8 +33133,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -33128,9 +33235,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turismo"
@@ -33218,9 +33325,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "patrimonio histórico"
@@ -33233,5 +33340,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "cantera"
@@ -33245,5 +33352,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "vertedero"
@@ -33265,5 +33372,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "cuenca"
@@ -33277,5 +33384,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "edificio agrario"
@@ -33298,5 +33405,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "venta al por menor"
@@ -33310,5 +33417,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "industrial"
@@ -33322,5 +33429,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -33334,5 +33441,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "área rururbana"
@@ -33346,5 +33453,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -33401,7 +33508,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "zona militar"
@@ -33415,5 +33522,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "cementerio"
@@ -33426,5 +33533,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "pico"
@@ -33439,5 +33546,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "glaciar"
@@ -33451,5 +33558,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "volcán"
@@ -33504,8 +33611,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "espacio natural"
@@ -33519,5 +33626,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "matorral"
@@ -33531,5 +33638,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "monte"
@@ -33543,5 +33650,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "plantación forestal"
@@ -33555,5 +33662,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "lodazal"
@@ -33567,5 +33674,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "playa"
@@ -33643,8 +33750,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "ruta"
@@ -33733,12 +33840,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "frontera"
@@ -33888,11 +33995,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "lugar"
@@ -33906,5 +34013,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "datos_TIGER"
@@ -34260,6 +34367,19 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid "closedway"
-#~ msgstr "vía sin salida"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "La vía seleccionada no contiene el nodo seleccionado."
+#~ msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Grados minutos segundos"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Introduzca un comentario para la subida (mínimo 3 caracteres)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Introduzca un comentario para la subida de este set de cambios (mín. 3 "
+#~ "caracteres)"
 
 #~ msgid "Move"
@@ -34330,7 +34450,4 @@
 #~ msgid "their version:"
 #~ msgstr "su versión:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versión resuelta:"
 
 #~ msgid "my version:"
@@ -34632,7 +34749,4 @@
 #~ msgid "Proxy server password"
 #~ msgstr "Contraseña del servidor proxy"
-
-#~ msgid "Boat"
-#~ msgstr "Barco"
 
 #~ msgid "Drawbridge"
@@ -34801,7 +34915,4 @@
 #~ msgid "error requesting update"
 #~ msgstr "errore al solicitar actualización"
-
-#~ msgid "Do not show again"
-#~ msgstr "No mostrar de nuevo"
 
 #~ msgid ""
@@ -35038,4 +35149,7 @@
 #~ msgid "Continue anyway"
 #~ msgstr "Continuar de todos modos"
+
+#~ msgid "closedway"
+#~ msgstr "vía sin salida"
 
 #~ msgid "Move Down"
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 22568)
+++ applications/editors/josm/i18n/po/et.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-11 20:05+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 12:48+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Estonian <et@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-07-28 09:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -123,6 +122,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -161,5 +160,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -229,5 +228,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -243,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -261,11 +260,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -273,20 +273,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -319,5 +319,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Liida"
@@ -385,5 +385,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -397,5 +397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -417,4 +417,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -431,6 +432,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -442,5 +443,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -575,22 +576,22 @@
 msgstr "Laen avatud muutustekogumeid alla ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Sobita tee"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Sobita mitu teed üheks."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Muuda suundi?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Pööra ja sobita."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -600,5 +601,5 @@
 "pöörata?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -606,10 +607,10 @@
 msgstr "Ei saa teid ühendada. Ei saa liita üheks sõlmejadaks."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Ühenda {0} teed."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Palun vali vähemalt kaks teed, mida sobitada."
@@ -656,10 +657,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -797,5 +798,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -861,10 +862,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Ekspordi GPX-i..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Ekspordi andmed GPX faili."
@@ -1056,5 +1057,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "Viide"
@@ -1470,20 +1471,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1507,5 +1508,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1516,6 +1517,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Viga"
@@ -1542,5 +1543,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1548,5 +1549,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Salvesta praegused andmed"
@@ -1603,10 +1604,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Salvesta nimega..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Salvesta need andmed uude faili."
@@ -1650,5 +1651,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1675,5 +1676,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr ""
@@ -1742,18 +1743,24 @@
 msgstr[1] "Lihtsusta tee (eemalda {0} sõlme)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Lahuta tee."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Lahuta tee valitud sõlme kohalt."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Valik ei ole lahutamiseks sobiv."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Valitud sõlmed ei ole samast teest."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1761,5 +1768,5 @@
 msgstr[1] "Valitud sõlmed ei ole tee keskel."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1775,20 +1782,10 @@
 "sõlmed kuuluvad"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Valitud sõlmed ei ole samast teest."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Valitud tee ei sisalda valitud sõlme"
-msgstr[1] "Valitud tee ei sisalda valitud sõlmi"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Sa pead valima kaks või rohkem sõlme, et ringikujulist teed poolitada"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1798,5 +1795,5 @@
 "middle of the way.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1804,5 +1801,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1810,5 +1807,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1960,5 +1957,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2919,22 +2916,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3075,25 +3072,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#, java-format
+msgid "Delete node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#, java-format
+msgid "Delete way {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
-msgid "Delete node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
-#, java-format
-msgid "Delete way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
-#, java-format
 msgid "Delete relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3102,5 +3099,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3109,5 +3106,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3116,5 +3113,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3123,5 +3120,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3271,5 +3268,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3352,7 +3349,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Viga lehekülje {0} laadimisel."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3522,8 +3519,15 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
 msgstr ""
 
@@ -3531,33 +3535,29 @@
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr ""
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr ""
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr ""
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3565,5 +3565,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3732,5 +3732,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "taust"
@@ -3874,5 +3874,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr ""
@@ -3900,5 +3900,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr ""
@@ -3920,6 +3920,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -3988,5 +3988,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr ""
@@ -4073,5 +4073,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4172,69 +4172,69 @@
 msgstr "Salasõna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4244,9 +4244,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4254,46 +4254,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Varaste lIsandprogrammidl laadimine"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Loon kasutajaliidest"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "LIsandprogrammide  laadimine"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Lahenda"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4302,5 +4301,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4396,33 +4395,33 @@
 msgstr "Vähenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+msgid "The geographic longitude at the mouse pointer."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
-msgid "The geographic longitude at the mouse pointer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The name of the object at the mouse pointer."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+msgid "The geographic latitude at the mouse pointer."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
-msgid "The geographic latitude at the mouse pointer."
+msgid "The angle between the previous and the current way segment."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
-msgid "The angle between the previous and the current way segment."
+msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4430,9 +4429,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4448,4 +4447,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Teenindus"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "Muutustekogumid"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Kommerts"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5153,5 +5167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "kõik"
@@ -5234,6 +5248,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5244,5 +5258,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5371,5 +5385,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Muutustekogumid"
@@ -5430,5 +5444,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5588,5 +5602,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5594,5 +5608,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5600,5 +5614,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5606,5 +5620,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5612,5 +5626,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5619,5 +5633,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5625,5 +5639,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5631,5 +5645,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5637,24 +5651,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5734,51 +5748,51 @@
 msgstr "Sule dialoog, ära loo uut sõlme"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Kihid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Ava kõikide laetud kihtide nimekiri."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Muuda valitud kihi nähtavust."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Näita/Peida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Muuda valitud kihi nähtavust."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Liiguta valitud kiht ühe rea võrra üles."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Liiguta valitud kiht ühe rea võrra alla."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr ""
@@ -5788,5 +5802,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Seosed"
@@ -6940,6 +6954,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6987,107 +7002,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Nimi"
@@ -7425,5 +7440,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7510,5 +7525,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<erinev>"
@@ -8236,5 +8251,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8307,8 +8322,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr ""
@@ -8337,6 +8352,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "tundmatu"
@@ -8657,5 +8672,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr ""
@@ -8714,14 +8729,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+msgid "Enter an upload comment"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9152,5 +9167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9172,5 +9187,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9178,60 +9193,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Lae muudatused üles"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Revisjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Jätka"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Rohkem ei näidata"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9551,115 +9598,23 @@
 msgstr[1] "{0} objekti kustutada:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Kohanda värvi"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Vaikimisi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Vali värv"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Heli import"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Piltide import"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
 #, java-format
 msgid "{0} track"
@@ -9669,23 +9624,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9694,5 +9649,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9701,10 +9656,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Muuda andme kihiks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9714,21 +9669,21 @@
 "kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Muudetud sellest: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9736,10 +9691,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9747,10 +9702,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9758,21 +9713,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9782,9 +9737,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9792,5 +9747,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9798,23 +9753,115 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Kohanda värvi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Vaikimisi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Vali värv"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Heli import"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Piltide import"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Andmekiht {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9823,11 +9870,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9836,36 +9883,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9873,5 +9920,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9880,5 +9927,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -9886,5 +9933,5 @@
 msgstr[1] "punktid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -9893,5 +9940,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -9900,5 +9947,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -9907,24 +9954,28 @@
 msgstr[1] "{0} punkti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Viga {0} parsimisel"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ei suutnud lugeda \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9933,34 +9984,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -9968,93 +10019,93 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10064,20 +10115,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10086,5 +10137,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10092,21 +10143,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10114,17 +10165,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10133,5 +10184,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10140,56 +10191,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10198,5 +10245,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10205,10 +10252,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10217,5 +10264,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10311,9 +10358,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10321,5 +10368,5 @@
 msgstr[1] "markerid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10328,14 +10375,26 @@
 msgstr[1] "{0} koosneb {1} markerist"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Pole heli markerit millest nihutada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Muuda markertekstide ja ikoonide nähtavust."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Sünkroniseeri heli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Kui kuuled sünkroniseerimisvihjet, pead heli pausile panema."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10343,30 +10402,18 @@
 msgstr "Heli sünkroniseeritud punktis {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Ei saa sükroniseerida kihis mis mängib."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Loo heli marker mängimise alguses"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr "Pane heli pausile punktis kuhu sa soovid markerit."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Pole heli markerit millest nihutada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Muuda markertekstide ja ikoonide nähtavust."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11210,4 +11257,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr ""
@@ -11222,5 +11270,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11323,5 +11371,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11329,5 +11377,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr ""
@@ -11357,5 +11405,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Autor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Both"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11363,9 +11424,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11373,34 +11434,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11408,13 +11469,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11422,9 +11483,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11432,46 +11493,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr ""
@@ -11825,21 +11894,25 @@
 msgstr "Muudatuste rakendumiseks pead JOSMi taaskäivitama."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
-msgid "Display coordinates as"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
 msgid "Projection method"
 msgstr "Projektsiooni meetodid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
+msgid "Display coordinates as"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+msgid "System of measurement"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12382,5 +12455,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12389,49 +12462,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Rohkem teavet sellest funktsioonist"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Valikulised tunnused:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tundmatu tüüp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12441,15 +12514,15 @@
 msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Viga sõelumisel {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente tüübist {0} toetatakse."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12459,17 +12532,17 @@
 msgstr[1] "Muuda {0} objekti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Midagi pole valitud!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12487,7 +12560,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Otsi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12496,17 +12568,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Otsi objekte."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Suurenda valikule"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Otsi objekte."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12803,5 +12872,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Parse error: vigane gpx dokumendi struktuur"
@@ -14237,5 +14306,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14504,5 +14573,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr ""
@@ -14844,41 +14913,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -14895,25 +14964,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -14951,18 +15020,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Ehitised"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15186,8 +15255,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr ""
@@ -15248,6 +15317,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "aadress"
@@ -15713,34 +15782,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Tühi kiht"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15749,14 +15818,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -15833,22 +15902,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Lae objekt alla..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Lae kaardi andmed OSM serverist"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Allalaetav ala"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Palun vali allalaadimiseks vähemalt üks toiming."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -15894,9 +15959,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15906,5 +15971,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -15913,11 +15978,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr ""
@@ -15927,5 +15992,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr ""
@@ -15935,13 +16000,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16180,5 +16245,5 @@
 msgstr ""
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr ""
@@ -16527,8 +16592,6 @@
 msgstr ""
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr ""
@@ -16559,5 +16622,5 @@
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr ""
@@ -16649,5 +16712,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -16711,13 +16774,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -16829,93 +16892,93 @@
 msgstr ""
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -16957,9 +17020,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17137,20 +17200,24 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "read protocol version"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17159,50 +17226,58 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17210,5 +17285,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Taasta"
@@ -17407,41 +17482,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -17740,4 +17815,13 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:288
 msgid "Terrace"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+msgid "Seamark Editor"
 msgstr ""
 
@@ -18425,6 +18509,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18434,9 +18518,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18515,6 +18599,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18522,5 +18606,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr ""
@@ -18765,7 +18849,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Raudtee"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
@@ -18814,5 +18897,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Hulknurk"
@@ -19329,5 +19412,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr ""
@@ -19463,10 +19546,10 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19612,10 +19695,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -19801,28 +19884,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -19833,64 +19912,68 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
 msgstr ""
 
@@ -19970,5 +20053,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20001,5 +20084,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20020,5 +20103,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "kultuurmets"
@@ -20037,71 +20120,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "piir"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "edasisuunaline osa"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "joon"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Hulknurk"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Võrk"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "ühistranspordi_plaanid"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Keelud"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "teekond"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Kleebi"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "aeronautika"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20375,7 +20448,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Laen alla OSM andmeid..."
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20572,6 +20644,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20580,5 +20657,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20587,5 +20664,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20594,10 +20671,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20606,5 +20683,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20614,5 +20691,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20621,15 +20698,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20638,5 +20715,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20769,5 +20846,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr ""
@@ -21306,5 +21383,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21317,5 +21394,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "mets"
@@ -21619,9 +21696,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr ""
@@ -21731,9 +21808,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr ""
@@ -21992,5 +22069,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr ""
@@ -22039,5 +22116,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr ""
@@ -22072,5 +22149,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr ""
@@ -22157,5 +22234,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "matkamine"
@@ -22190,5 +22267,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22358,14 +22435,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operaatorfirma"
@@ -22633,6 +22710,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr ""
@@ -23080,5 +23157,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
@@ -23484,5 +23561,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Pinge"
@@ -23846,31 +23923,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Avatud"
@@ -23930,90 +24007,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24126,7 +24203,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr ""
@@ -24142,5 +24219,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr ""
@@ -24153,6 +24230,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr ""
@@ -24328,5 +24405,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr ""
@@ -24363,6 +24440,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr ""
@@ -24370,5 +24447,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr ""
@@ -24487,5 +24564,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Tuletorn"
@@ -24646,5 +24723,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr ""
@@ -24652,73 +24729,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "kohalik"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Kiirtoit"
@@ -24726,17 +24808,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Kohvik"
@@ -24744,9 +24826,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pubi"
@@ -24754,18 +24836,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Baar"
@@ -24773,9 +24856,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Ööklubi"
@@ -24783,24 +24866,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Vaatamisväärsus"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Muuseum"
@@ -24808,9 +24891,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Loomaaed"
@@ -24819,9 +24902,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr ""
@@ -24829,24 +24912,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Teemapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr ""
@@ -24854,5 +24937,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr ""
@@ -24860,19 +24943,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Infopunkt"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -24910,5 +24993,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24916,28 +24999,28 @@
 msgstr "tänav"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -24947,5 +25030,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -24953,5 +25036,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Matkamine"
@@ -24959,6 +25042,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr ""
@@ -24966,5 +25049,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -24972,6 +25055,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Suusatamine"
@@ -24979,5 +25062,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -24985,46 +25068,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25032,29 +25122,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr ""
@@ -25062,25 +25152,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Lõkkease"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Piknikuplats"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Ajaloolised kohad"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Loss"
@@ -25089,19 +25179,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Varemed"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr ""
@@ -25110,9 +25200,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr ""
@@ -25120,10 +25210,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25131,5 +25221,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25137,15 +25227,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Mälestusmärk"
@@ -25153,55 +25243,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Puhkus"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Veepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Mänguväljak"
@@ -25209,35 +25299,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Kalapüük"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Staadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr ""
@@ -25251,6 +25341,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "vali spordiala:"
@@ -25666,31 +25756,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr ""
@@ -25700,240 +25790,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "kanuu"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "suusatamine"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "jalgpall"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "lauatennis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golfiväljak"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Miniatuurne golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Mitu"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr ""
@@ -25975,23 +26065,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "tüüp"
@@ -26033,211 +26123,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Kergejõustik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Vibusport"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Ujumine"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr ""
@@ -26245,52 +26335,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "mägi"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "murdmaa"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "lumepark"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "kerge"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Lasketiir"
@@ -26298,204 +26388,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Jalgpall"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Vali pesapall"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Vali korvpall"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "Golfiväljak"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Vali kriket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Vali laua tennis"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Vali tennis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Hoone"
@@ -26503,5 +26593,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Avalik hoone"
@@ -26509,10 +26599,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Raekoda"
@@ -26520,10 +26610,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Vali raekoda"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Saatkond"
@@ -26531,10 +26621,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Vali saatkond"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -26543,10 +26633,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Vali kohtumaja"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Vangla"
@@ -26555,10 +26645,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Vali vangla"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Politsei"
@@ -26568,10 +26658,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Vali politsei"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -26580,10 +26670,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Vali tuletõrjedepoo"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Postkontor"
@@ -26591,5 +26681,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr ""
@@ -26597,15 +26687,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Vali lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Kool"
@@ -26613,10 +26703,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Vali kool"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Ülikool"
@@ -26624,10 +26714,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Vali ülikool"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Kolledž"
@@ -26635,5 +26725,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Vali kolledž"
@@ -26641,5 +26731,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Kino"
@@ -26648,10 +26738,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Vali kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Raamatukogu"
@@ -26660,9 +26750,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Vali raamatukogu"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr ""
@@ -26670,10 +26760,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Teater"
@@ -26682,10 +26772,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Vali teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Palvekoht"
@@ -26695,5 +26785,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Vali palvekoht"
@@ -26702,6 +26792,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religioon"
@@ -26710,66 +26800,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "kristlane"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "juudi"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "moslem"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastrism (pärsia)"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Usutunnistus"
@@ -26778,81 +26868,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglikaan"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "katoliku"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evangeelne"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "jehoovatunnistajad"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "luterlane"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormoon"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "ortodoksne"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "nelipühalane"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbüterlane"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestantlik"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "kveeker"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "šiia"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Aadressid"
@@ -26861,5 +26951,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Vali aadressi infot"
@@ -26867,5 +26957,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Maja number"
@@ -26873,25 +26963,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Maja nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Linna nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Posti kood"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Riigi kood"
@@ -26900,5 +26990,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -26906,61 +26996,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "paaritu"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "paaris"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Inimtekkeline"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Töökojad"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Vali töökojad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Vali torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -26968,25 +27058,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Vali veetorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gaasimahuti"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Vali gaasimahuti"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -26994,10 +27084,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Vali majakas"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -27005,10 +27095,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Vali tuuleveski"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Torustik"
@@ -27017,41 +27107,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Vali torustik"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gaas"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "õli"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr ""
@@ -27061,10 +27151,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Kraana"
@@ -27072,5 +27162,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Vali kraana"
@@ -27078,10 +27168,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Vali tuletorn"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -27089,10 +27179,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Vali ülevaatlus punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -27100,23 +27190,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Vali järelvalve kaamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Elektri generaator"
@@ -27126,35 +27216,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Vali elektri generaator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "tuul"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "hüdro"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fosiil"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "tuuma"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "süsi"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "päikeseenergia"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Elektrijaam"
@@ -27163,10 +27253,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Vali elektrijaam"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Elektrialajaam"
@@ -27175,5 +27265,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Vali elektri alajaam"
@@ -27181,10 +27271,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr ""
@@ -27195,23 +27285,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr ""
@@ -27220,21 +27310,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Joonetüüp"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "joon"
-
-#: build/trans_presets.java:2452
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27242,55 +27331,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "üksik"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "topelt"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "kolmekordne"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Teenused"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Tualetid"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Märkus"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefon"
@@ -27299,5 +27388,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr ""
@@ -27305,5 +27394,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Mündid"
@@ -27311,5 +27400,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Märkused"
@@ -27317,5 +27406,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27323,5 +27412,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Deebetkaart"
@@ -27329,15 +27418,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Krediitkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -27346,5 +27435,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Muuda jäätmekäitlusjaam"
@@ -27352,35 +27441,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Riided"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Vanaraud"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27388,5 +27477,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27395,31 +27484,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Materjal"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "kivi"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plastikust"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Värv"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "must"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "pruun"
@@ -27498,39 +27587,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "roheala"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "punane"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "sinine"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "hall"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "valge"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Muuda jahiala"
@@ -27539,30 +27628,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Kõrgus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "madal"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "pool"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "täis"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Peida"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Lukusta"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Purskaev"
@@ -27571,10 +27660,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Vali purskaev"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Joogi vesi"
@@ -27583,10 +27672,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Vali joogivee asukoht"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -27595,5 +27684,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27601,5 +27690,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr ""
@@ -27607,15 +27696,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -27623,10 +27712,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -27635,28 +27724,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Vali Supermarket"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Nurgakauplus"
@@ -27664,9 +27753,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Vali nurgakauplus"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -27674,27 +27763,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Vali kiosk"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Lihunik"
@@ -27702,9 +27791,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Vali lihunik"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Pagar"
@@ -27712,9 +27801,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Vali pagar"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Lilleseadja"
@@ -27722,18 +27811,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Vali lilleseadja"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Ökokaubad"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Redigeeri ökopoodi"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -27741,54 +27830,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Redigeeri alkoholi poode"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Joogipood"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Arvuti"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Vali arvutipood"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Elektroonika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Vali elektroonika pood"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Mööbel"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Vali mööblipood"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Aiakeskus"
@@ -27796,9 +27885,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Vali aiakeskus"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Riistvara"
@@ -27806,9 +27895,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Vali riistvara pood"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -27816,54 +27905,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Kirjatarbed"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Vali kirjatarvete pood"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Juuksur"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Vali juuksur"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Jalatsid"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Vali jalatsi pood"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Mänguasjad"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Vali mänguasja pood"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Vali video pood"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Kuiir puhastus"
@@ -27871,9 +27960,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Vali kiirpuhastus"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Pesumaja"
@@ -27881,9 +27970,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Vali pesumaja"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Välisuks"
@@ -27891,24 +27980,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Vali välisukse pood"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Vali spordi pood"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Vali optika"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr ""
@@ -27916,5 +28005,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr ""
@@ -27922,97 +28011,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "toit"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "joogid"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "maiustused"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "suitsud"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "fotod"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "looma_toit"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "ajalehed"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "mänguasjad"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "templid"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "telefoni_kaardid"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "kondoomid"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampoonid"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Sularaha"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Pank"
@@ -28020,14 +28109,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Vali Pank"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Sularaha automaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Rahavahetus"
@@ -28035,5 +28124,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Vali rahavahetuse punkt"
@@ -28041,15 +28130,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Vali sularaha automaat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Tervis"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Arstid"
@@ -28057,18 +28146,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Vali arstid"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Vali hambaarst"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -28076,5 +28165,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Vali Apteek"
@@ -28082,9 +28171,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Retseptuur"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Haigla"
@@ -28092,10 +28181,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Vali haigla"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -28104,5 +28193,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Vali hädaabi tugijaam"
@@ -28111,20 +28200,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Punkti nimi"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Telefoninumber"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28132,5 +28221,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -28139,64 +28228,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Vali loomaarst"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geograafia"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Asukohad"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Vali kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Vali maa"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Riik"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Vali riik"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Regioon"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Vali regioon"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Maakond"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Vali maakond"
@@ -28204,15 +28293,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Linn"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Vali linn"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Linn"
@@ -28220,10 +28309,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Muuda linna"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Linnaosa"
@@ -28231,25 +28320,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Muuda linnaosa"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Küla/Alevik/Alev"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Muuda küla/alevik/alev"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Küla"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Muuda küla"
@@ -28257,5 +28346,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Asustamata koht"
@@ -28263,10 +28352,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Muuda asustamata kohta"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Saar"
@@ -28274,10 +28363,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Muuda saart"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -28285,5 +28374,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -28291,5 +28380,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Koobas"
@@ -28297,10 +28386,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Muuda koobast"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Mäetipp"
@@ -28308,10 +28397,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Muuda mäetippu"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Liustik"
@@ -28319,10 +28408,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Muuda liustikku"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -28330,70 +28419,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Muuda vulkaani"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Piirid"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Riiklikud"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Muuda riiklikke piire"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administratiivpiir"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Muuda administratiivpiire"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Omavalitsus"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Muuda omavalitsuse piire"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Valimisringkond"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Muuda valimisringkonda"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Rahvuspark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Muuda rahvuspargi piire"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Üksik puu"
@@ -28402,15 +28491,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Muuda puud"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Botaaniline nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Mets"
@@ -28419,5 +28508,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Muuda metsa"
@@ -28425,17 +28514,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "okasmets"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "lehtmets"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "segamets"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Kultuurmets"
@@ -28444,14 +28533,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Muuda kultuurmetsa"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Looduskaitseala"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Muuda looduskaitseala"
@@ -28459,25 +28548,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "klibu, rusukalle"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Muuda rusukallet"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Võsa"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Muuda võsa"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Langus"
@@ -28485,10 +28574,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Muuda langust"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Nõmm"
@@ -28496,5 +28585,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Muuda nõmme"
@@ -28502,5 +28591,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -28509,45 +28598,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Muuda taluõue"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Muuda talumaad"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Niit/Karjamaa"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Muuta niitu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Muuda viinapuuistandust"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Eraldised"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Muuda eraldisi"
@@ -28555,25 +28644,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Aed"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Muuda aeda"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Muru"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Muuda muru"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Külatanum"
@@ -28581,10 +28670,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Muuda külatanumat"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Avalik maa"
@@ -28592,20 +28681,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Muuda avalikku maad"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Muuda parki"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -28613,5 +28702,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Muuda puhkeala"
@@ -28619,15 +28708,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Muuda elamurajooni"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -28635,9 +28724,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Muuda matmispaika"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -28645,39 +28734,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Muuda kalmistut"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Muuda kaubandust"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Muuda kommertspiirkonda"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Muuda tööstuspiirkonda"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Raudtee"
@@ -28685,15 +28774,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Muuda raudteed"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Militaarala"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Muuda militaarala"
@@ -28701,50 +28790,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Muuda ehitustandrit"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Muuda jäätmaad"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Muuda roheala"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Muuda prügimäge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Kivimurd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Muuda kivimurdu"
@@ -28754,5 +28843,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Muuda hulknurka"
@@ -28764,5 +28853,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "väline osa"
@@ -28770,5 +28859,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "siseosa"
@@ -28776,5 +28865,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -28785,5 +28874,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -28791,36 +28880,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -28828,5 +28917,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Pöördekeelud"
@@ -28835,5 +28924,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Muuda pöördekeelde"
@@ -28841,34 +28930,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -28877,15 +28966,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "teelt"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "üle sõlme või tee"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "teele"
@@ -28893,5 +28982,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Teekond"
@@ -28900,5 +28989,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Muuda teekonda"
@@ -28906,5 +28995,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "teekonna tüüp"
@@ -29012,5 +29101,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29021,17 +29110,17 @@
 msgstr "jalgrattaga"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "tee"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "praam"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "suusad"
@@ -29099,5 +29188,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29107,9 +29196,9 @@
 msgstr "jalgsi"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "tramm"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "ümbersõit"
@@ -29123,10 +29212,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metroo"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "sümboolne kirjeldus"
@@ -29134,31 +29223,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Võrk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "planeeritud"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "täiendav"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "ajutine"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "ühendus"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Värv (hex)"
@@ -29167,30 +29256,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "teekonna osa"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "peatuspunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "edasisuunaline peatuspunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "tagasisuunaline peatuspunkt"
@@ -29417,5 +29506,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "kasutusest väljas"
@@ -30068,4 +30157,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30169,11 +30266,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "inimtekkeline"
@@ -30686,5 +30783,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "kai"
@@ -30698,5 +30795,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "torujuhe"
@@ -30840,13 +30937,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "puhkealad"
@@ -30860,5 +30957,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "paadisadam"
@@ -30954,10 +31051,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "mugavused"
@@ -31059,10 +31156,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "autohooldus"
@@ -31500,24 +31597,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "muud teenused"
@@ -31549,6 +31646,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "vesi"
@@ -31609,8 +31706,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "tervishoid"
@@ -31963,26 +32060,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "pood"
@@ -32054,8 +32151,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotell"
@@ -32156,9 +32253,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turism"
@@ -32246,9 +32343,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "alalooline"
@@ -32261,5 +32358,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "kivimurd"
@@ -32273,5 +32370,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "prügimägi"
@@ -32293,5 +32390,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "tehisjärv"
@@ -32305,5 +32402,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "taluõu"
@@ -32326,5 +32423,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "kaubandus"
@@ -32338,5 +32435,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "tööstus"
@@ -32350,5 +32447,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "jäätmaa"
@@ -32362,5 +32459,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "rohepiirkond"
@@ -32374,5 +32471,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "raudteede piirkond"
@@ -32429,7 +32526,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "militaarala"
@@ -32443,5 +32540,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "kalmistu"
@@ -32454,5 +32551,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "mäetipp"
@@ -32467,5 +32564,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "liustik"
@@ -32479,5 +32576,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "vulkaan"
@@ -32532,8 +32629,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "looduslik"
@@ -32547,5 +32644,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "põõsastik"
@@ -32559,5 +32656,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "nõmm"
@@ -32571,5 +32668,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -32583,5 +32680,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "muda"
@@ -32595,5 +32692,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "rand"
@@ -32671,8 +32768,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "teekond"
@@ -32761,12 +32858,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "piir"
@@ -32916,11 +33013,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "koht"
@@ -32934,5 +33031,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33291,6 +33388,8 @@
 #~ msgstr "Lae OSMi serverisse"
 
-#~ msgid "closedway"
-#~ msgstr "suletud tee"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Valitud tee ei sisalda valitud sõlme"
+#~ msgstr[1] "Valitud tee ei sisalda valitud sõlmi"
 
 #~ msgid "Move"
@@ -33340,7 +33439,4 @@
 #~ msgid "my version:"
 #~ msgstr "minu versioon:"
-
-#~ msgid "Do not show again"
-#~ msgstr "Rohkem ei näidata"
 
 #~ msgid "Please report a ticket at {0}"
@@ -33411,4 +33507,7 @@
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
+
+#~ msgid "closedway"
+#~ msgstr "suletud tee"
 
 #~ msgid "Tags (empty value deletes tag)"
Index: applications/editors/josm/i18n/po/eu.po
===================================================================
--- applications/editors/josm/i18n/po/eu.po	(revision 22568)
+++ applications/editors/josm/i18n/po/eu.po	(revision 22569)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
+"POT-Creation-Date: 2010-08-04 19:03+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-07-28 09:42+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -123,6 +122,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -161,5 +160,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -235,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -249,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -267,11 +266,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -279,20 +279,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -325,5 +325,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Bateratu"
@@ -393,5 +393,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -405,5 +405,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -425,4 +425,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -439,6 +440,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -450,5 +451,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -583,22 +584,22 @@
 msgstr "Aldaketa multzo irekiak deskargatzen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Bideak konbinatu"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Batera itzazu hainbat bide bide bakar batean."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Norabideak aldatu?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Norabidea aldatu eta bateratu"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -608,5 +609,5 @@
 "norabidea aldatzea nahi al duzu?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -615,10 +616,10 @@
 "Ezin izan dira bideak elkartu (ezin izan dira nodo kate bakar batean batu)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} bideak bateratu"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Aukeratu bateratzeko bi bide gutxienez."
@@ -665,10 +666,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -809,5 +810,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -873,10 +874,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "GPX-ra esportatu..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Esportatu datuak GPX fitxategira"
@@ -1072,5 +1073,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1517,20 +1518,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1554,5 +1555,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1563,6 +1564,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Errorea"
@@ -1589,5 +1590,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1595,5 +1596,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Gorde orain arteko datuak."
@@ -1650,10 +1651,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Gorde honela..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Gorde orain arteko datuak fitxategi berri batean."
@@ -1700,5 +1701,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1725,5 +1726,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Ez, bertan behera utzi"
@@ -1793,18 +1794,24 @@
 msgstr[1] "Bide sinplifikatua (ezabatu {0} nodoak)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Bereizi bidea"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Bereizi bidea aukeratutako nodoan."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Egungo aukeraketa ezin da erabili bereizketarako."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Aukeratutako nodoek ez dute bide bera partekatzen."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1812,5 +1819,5 @@
 msgstr[1] "Aukeratutako nodoak ez daude inongo bideren erdian."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1825,20 +1832,10 @@
 "ere."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Aukeratutako nodoek ez dute bide bera partekatzen."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Aukeratutako bidean ez dago aukeratutako nodoa."
-msgstr[1] "Aukeratutako bidean ez daude aukeratutako nodoak."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Bide biribil bat bereizteko bi nodo, gutxienez, aukeratu behar dituzu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1848,5 +1845,5 @@
 "adabegiak aukeratu)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1857,5 +1854,5 @@
 "beharrezkoa denean.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1865,5 +1862,5 @@
 "egin beharko zenuke hau eta zuzendu beharrezkoa denean.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2016,5 +2013,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3064,22 +3061,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3225,26 +3222,26 @@
 msgstr "Ezin izan da konpondu ebatzita ez zegoen gatazka bat."
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 "Gutxienez objektu bat beharko duzu ezabatzeko, zeure bilduman ez dago ezer"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "{0} nodoa ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "{0} bidea ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "{0} erlazioa ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3253,5 +3250,5 @@
 msgstr[1] "Ezabatu {0} objektuak"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3260,5 +3257,5 @@
 msgstr[1] "Ezabatu {0} nodoak"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3267,5 +3264,5 @@
 msgstr[1] "Ezabatu {0} bideak"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3274,5 +3271,5 @@
 msgstr[1] "Ezabatu {0} erlazioak"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3429,5 +3426,5 @@
 msgstr "Aplikatu?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3709,42 +3706,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Graduak Minutuak Segundoak"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Proiektatutako koordenatuak"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "H"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "I"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "M"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3753,5 +3753,5 @@
 "Ezin izan da jatorrizko {0}-a gehitu datu-multzora beronen barne delako jada"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3932,5 +3932,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "hondoa"
@@ -4078,5 +4078,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Ez erakutsi berriz (aukera gogoratzen du)"
@@ -4104,5 +4104,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "trenbidea"
@@ -4124,6 +4124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4192,5 +4192,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "eraikina"
@@ -4277,5 +4277,5 @@
 msgstr "Objektua ezabatu da"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4377,29 +4377,29 @@
 msgstr "Pasahitza"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "erabilera"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "aukerak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Erakutsi laguntza hau"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Unixeko geometria argumento estandarra"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Deskargatu inguru-koadroa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Deskargatu URL-ean zehaztutako tokia (lat=x&lon=y&zoom=z erabiliz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4407,9 +4407,9 @@
 "Ireki aukerarekin)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Deskargatu inguru-koadroa gps datu gordin moduan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4417,33 +4417,33 @@
 "gordin moduan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Aukeratu emandako bilaketarekin"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Abiarazi modu maximizatuan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Preferentziak jatorrizkora berrezarri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Hizkuntza ezarri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "aukera hauek Java-ren sistema propietate moduan ematen dira"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/JOSM/KARPETARA/BIDEA/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Erabiltzailearen hobespen guztientzat karpeta aldatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4457,9 +4457,9 @@
 "megabytetan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "adibideak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4469,47 +4469,46 @@
 "prozesatzen dira."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 "--selection erabiltzen baduzu, ziurtatu zenbait datu kargatzen dituzula."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Hasieratzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Pluginak eguneratzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Eguneratutako pluginak instalatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Hasierako pluginak kargatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Hobespen orijinalak ezartzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "GUI nagusia sortzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Pluginak kargatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Konpondu"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4518,5 +4517,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4612,33 +4611,33 @@
 msgstr "Zooma urrundu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "eskala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Longitude geografikoa saguaren puntuan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Saguaren puntuan dagoen objektuaren izena"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Latitude geografikoa saguaren puntuan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Aurreko eta oraingo segmentuen arteko angelua."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Marrazten ari garen segmentuaren norabidea."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Marrazten ari garen bide berriaren luzeera."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4648,9 +4647,9 @@
 "zuzenean aukeratzeko.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(objekturik ez)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4666,4 +4665,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "\"{0}\" geruzak, geruzen zerrendan egon behar du"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Zerbitzu-bidea"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "txinatarra"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Bulegoak"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5408,5 +5422,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "denak"
@@ -5489,6 +5503,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5499,5 +5513,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5626,5 +5640,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Aldaketa-multzoa"
@@ -5685,5 +5699,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5842,5 +5856,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5848,5 +5862,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5854,5 +5868,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5860,5 +5874,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5866,5 +5880,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5873,5 +5887,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5879,5 +5893,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5885,5 +5899,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5891,24 +5905,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Iragazkia aktibatuta dago</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objektuak ezkutaturik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<p><b>{0}</b> objektuak desgaiturik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5990,51 +6004,51 @@
 msgstr "Itxi elkarrizketa-leihoa, ez sortu nodo berririk"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Geruzak"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Kargatutako geruzen zerrenda ireki"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Aukeratutako geruzak ezabatu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Erakutsi/Ezabatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Aktibatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Aukeratutako geruzak aktibatu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Geruza hau bikoiztu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Aukeratutako geruza lerro bat gorantz mugitu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Aukeratutako geruza lerro bat beherantz mugitu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Geruzari buruzko informazioa"
@@ -6044,5 +6058,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Erlazioak"
@@ -7196,6 +7210,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7243,107 +7258,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Izena"
@@ -7681,5 +7696,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7766,5 +7781,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<ezberdina>"
@@ -8491,5 +8506,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8562,8 +8577,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr ""
@@ -8592,6 +8607,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr ""
@@ -8912,5 +8927,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Gatazkak aurkitu dira"
@@ -8971,14 +8986,14 @@
 "batekin"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Egin iruzkin labur bat igotzen ari zaren aldaketentzako:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+msgid "Enter an upload comment"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9409,5 +9424,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9429,5 +9444,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9435,60 +9450,91 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Aldaketak igo"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Alderantzikatu"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Jarraitu"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+msgid "Do not show this message again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9808,115 +9854,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
 #, java-format
 msgid "{0} track"
@@ -9926,23 +9880,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9951,5 +9905,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9958,10 +9912,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9969,21 +9923,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9991,10 +9945,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10002,10 +9956,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10013,21 +9967,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10037,9 +9991,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10047,5 +10001,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10053,23 +10007,115 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10078,11 +10124,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10091,36 +10137,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10128,5 +10174,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10135,5 +10181,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10141,5 +10187,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10148,5 +10194,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10155,5 +10201,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10162,24 +10208,28 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10188,34 +10238,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10223,93 +10273,93 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10319,20 +10369,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10341,5 +10391,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10347,21 +10397,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10369,17 +10419,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10388,5 +10438,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10395,56 +10445,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10453,5 +10499,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10460,10 +10506,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10472,5 +10518,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10566,9 +10612,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10576,5 +10622,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10583,14 +10629,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10598,29 +10656,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
@@ -11463,4 +11509,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr ""
@@ -11475,5 +11522,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11576,5 +11623,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11582,5 +11629,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr ""
@@ -11610,5 +11657,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Egilea"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Diesela"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Both"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11616,9 +11677,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11626,34 +11687,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11661,13 +11722,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11675,9 +11736,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11685,46 +11746,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr ""
@@ -12078,21 +12147,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+msgid "System of measurement"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12635,5 +12708,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12642,49 +12715,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12694,15 +12767,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12712,17 +12785,17 @@
 msgstr[1] "Aldatu {0} objektuak"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12740,7 +12813,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Bilatu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12749,7 +12821,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Objektuak bilatu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
@@ -12758,7 +12829,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Objektuak bilatu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13053,5 +13123,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -14487,5 +14557,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14747,5 +14817,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr ""
@@ -15087,41 +15157,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15138,25 +15208,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Eraikinen zabalera:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15194,18 +15264,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Eraikinak"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15429,8 +15499,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr ""
@@ -15491,6 +15561,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr ""
@@ -15956,34 +16026,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Geruza garbia"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15992,14 +16062,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -16076,22 +16146,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Deskargatu objektua..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Jaitsi aukeratutako bidearen bukaerako mapa-datuak"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Orain jaitsi"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Aukeratu bateratzeko bi nodo gutxienez."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16137,9 +16203,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -16149,5 +16215,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -16156,11 +16222,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr ""
@@ -16170,5 +16236,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr ""
@@ -16178,13 +16244,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16423,5 +16489,5 @@
 msgstr ""
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr ""
@@ -16770,8 +16836,6 @@
 msgstr ""
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr ""
@@ -16802,5 +16866,5 @@
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr ""
@@ -16892,5 +16956,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -16954,13 +17018,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17072,93 +17136,93 @@
 msgstr ""
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -17200,9 +17264,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17380,20 +17444,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "Konbinatutako bertsioa"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17402,50 +17471,58 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17453,5 +17530,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr ""
@@ -17650,41 +17727,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Mapa irristakorra"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -17983,4 +18060,13 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:288
 msgid "Terrace"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+msgid "Seamark Editor"
 msgstr ""
 
@@ -18668,6 +18754,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18677,9 +18763,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18758,6 +18844,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18765,5 +18851,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr ""
@@ -19000,32 +19086,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Bateratu bikoiztutako nodoak?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Bateratu bikoiztutako nodoak?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Bateratu bikoiztutako nodoak?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Bateratu bikoiztutako nodoak?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Bateratu bikoiztutako nodoak?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Bateratu bikoiztutako nodoak?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19062,5 +19142,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipoligonoa"
@@ -19582,5 +19662,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "azalera"
@@ -19723,10 +19803,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr "Bideoan egungo kokapena erakusten du"
@@ -19875,10 +19955,10 @@
 "Ezin izan da walking-papers.org-ko \"{0}\" ID-aren informazioa irakurri"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20074,9 +20154,5 @@
 "Koordenatu okerretara eraman gaitzake honek."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Jaitsiera automatikoa"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -20084,19 +20160,19 @@
 "Kontuz: WMS geruza desaktibatu egin da \"{0}\" URLaren malformazioagatik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(desaktibatua)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "({0}) WMS geruza, {1} zoom mailan jaisten"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20111,17 +20187,17 @@
 "jaitsi nahi dituzu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Bai, jaitsi irudiak"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "URL desegokia?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Jaitsi ikusgai dauden \"tile\"ak"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20130,33 +20206,33 @@
 "bereizmena"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Bereizmena aldatu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "\"Tile\" okerrak berriz kargatu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Alpha kanala"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Gorde WMS geruza fitxategian"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Gorde WMS geruza"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Kargatu WMS geruza fitxategitik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Kargatu WMS geruza"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -20164,15 +20240,19 @@
 "Sustengurik gabeko WMS fitxategi-bertsioa; {0} aurkitu da eta {1} espero zen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Fitxategiaren formatuan errorea"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Fitxategia kargatzean errorea"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "WMS laster-marka ezarri"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Jaitsiera automatikoa"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20252,5 +20332,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20287,5 +20367,5 @@
 msgstr "Audio-gailua ez dago eskuragarri"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20306,5 +20386,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "basoa"
@@ -20323,71 +20403,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "muga"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "hurrengo segmentua"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "Linea"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "multipoligonoa"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Sarea"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "garraio publikoa"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Debekua"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "ibilbidea"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "gunea"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "ubidea"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20664,7 +20734,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Datuak deskargatu"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20892,6 +20961,11 @@
 msgstr "Bloke bakanetatik elkar-atxikitako etxeak sortzen ditu"
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20902,5 +20976,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20911,5 +20985,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20920,5 +20994,5 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
@@ -20927,5 +21001,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20937,5 +21011,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20948,5 +21022,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20958,15 +21032,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Elkar-konektaturiko bide luzeen deskarga erraza"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Aukeratu adarkadura ez dute konektaturiko bideak"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20977,5 +21051,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21110,5 +21184,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Erreferentzia"
@@ -21647,5 +21721,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "metala"
@@ -21658,5 +21732,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "egurra"
@@ -21960,9 +22034,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "bai"
@@ -22072,9 +22146,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "ez"
@@ -22333,5 +22407,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "kalea"
@@ -22380,5 +22454,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "zerbitzu-bidea"
@@ -22413,5 +22487,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "eraikitzen"
@@ -22498,5 +22572,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "xenda"
@@ -22531,5 +22605,5 @@
 msgstr "ona"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "ertaina"
@@ -22699,14 +22773,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operadorea"
@@ -22974,6 +23048,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Garaiera"
@@ -23421,5 +23495,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "padura"
@@ -23825,5 +23899,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Tentsioa"
@@ -24187,31 +24261,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Irekiera-ordutegia"
@@ -24271,90 +24345,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Astelehenetik ostiralera 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Asteartetik Igandera 08:00-15:00; Larunbatetan 08:00-12:00"
@@ -24467,7 +24541,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Erreferentzia zenbakia"
@@ -24483,5 +24557,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "lurrazpian"
@@ -24494,6 +24568,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Ordainpekoa"
@@ -24669,5 +24743,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Gurpildun aulkia"
@@ -24704,6 +24778,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Babeslekua"
@@ -24711,5 +24785,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Jarlekua"
@@ -24828,5 +24902,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Baliza"
@@ -24987,5 +25061,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Sukaldaritza"
@@ -24993,73 +25067,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italiarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "txinatarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizzeria"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hanburgesategia"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "greziarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "alemaniarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indiarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "bertakoa"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turkiarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asiarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thailandiarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexikarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japoniarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "frantsesa"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "sandwich-a"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "sushi-a"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Otordu lasterreko jatetxea"
@@ -25067,17 +25146,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Otordu lasterreko jatetxea editatu"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "fish and chips (arraina eta pataten jatetxea)"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "oilaskoa"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Kafetegia"
@@ -25085,9 +25164,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Kafetegia editatu"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub"
@@ -25095,18 +25174,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Pub-a editatu"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Biergarten-a editatu"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Taberna"
@@ -25114,9 +25194,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Taberna editatu"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Diskoteka"
@@ -25124,24 +25204,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Diskoteka editatu"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turismoa"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Erakarpena"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Erakarpena editatu"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museoa"
@@ -25149,9 +25229,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Museoa editatu"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -25160,9 +25240,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Zooa editatu"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Ikuspegi-gunea"
@@ -25170,24 +25250,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Ikuspegi-gunea editatu"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Zelata-dorrea"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Jolas-parkea"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Jolas-parkea editatu"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Artelana"
@@ -25195,5 +25275,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Artelana editatu"
@@ -25201,19 +25281,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Informazio bulegoa"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Xehetasun-maila"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "topografiko"
@@ -25251,5 +25331,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25257,28 +25337,28 @@
 msgstr "kalea"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "eskema"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Erakutsitako ingurua"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "gunea"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "hiria"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "erregioa"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Deskribapen zehatzagoa"
@@ -25288,5 +25368,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Erakutsitako bideak:"
@@ -25294,5 +25374,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Mendi-ibiliak"
@@ -25300,6 +25380,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Txirrindularitza"
@@ -25307,5 +25387,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Mendi-bizikleta"
@@ -25313,6 +25393,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Eskia"
@@ -25320,5 +25400,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Zaldiketa"
@@ -25326,46 +25406,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "... beste garraio mota batzuk aukeran"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Informazio-panela"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Iragarki-taula"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "oharra"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "basa-bizitza"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "landareak"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Informazio-zutoina"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "postea"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Informazio-gunea"
@@ -25373,29 +25461,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Deskribapen zehatza"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Audiogida"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Telefono mugikor bidezko audiogida?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Telefono zenbakia"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Beste informazio gune batzuk"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Aterpea editatu"
@@ -25403,25 +25491,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Barbakoa"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Piknik-gunea"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Piknik-gunea editatu"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Gune historikoak"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Gaztelua"
@@ -25430,19 +25518,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Gaztelua editatu"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Hondakinak"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Hondakinak editatu"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Gune-arkeologikoa"
@@ -25451,9 +25539,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Gune-arkeologikoa editatu"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Gudu-zelaia"
@@ -25461,10 +25549,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Gudu-zelaia editatu"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Gune-paleontologikoa"
@@ -25472,5 +25560,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Gune-paleontologikoa editatu"
@@ -25478,15 +25566,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monumentua"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Monumentua editatu"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Oroitarria"
@@ -25494,55 +25582,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Oroitarria editatu"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Gurutzadura"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Gurutzadura editatu"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Santutxoa"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Santutxoa editatu"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Mugarria"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Mugarria editatu"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Aisia"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Ur-jolasen parkea"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Ur-jolasen parkea editatu"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Jolastokia"
@@ -25550,35 +25638,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Jolastokia editatu"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Arrantza"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Arrantza editatu"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Kirolak"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Kirol-instalazioak"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Estadioa"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Estadioa editatu"
@@ -25592,6 +25680,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "aukeratu kirola:"
@@ -26007,31 +26095,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "kirola"
@@ -26041,240 +26129,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "arku-tiroa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "atletismoa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "futbol australiarra"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "beisbola"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "saskibaloia"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "bola-jokoa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "alpinismoa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "cricketa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "Saredun-cricketa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "croqueta"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "txirrindularitza"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "txakur-lasterketa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "hipika"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golfa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hockeya"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "zaldi-lasterketa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "motorra"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "euskal pilota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "erraketa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "skate-a"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "patinajea"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "eskia"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "futbola"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "igeriketa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "ping-pong-a"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tenisa"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Kiroldegia"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Kiroldegia editatu"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Kirol-zelaia"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Kirol-zelaia editatu"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Lasterketa-pista"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Lasterketa-pista editatu"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golf-zelaia"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Golf-zelaia editatu"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Minigolfa"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Minigolfa editatu"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Kirola"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Multi"
@@ -26316,23 +26404,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "mota"
@@ -26374,211 +26462,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "zelaia"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "kiroldegia"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "estadioa"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Bola-jokoa"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Bola-jokoa editatu"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Atletismoa"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Atletismoa editatu"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Arku-tiroa"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Arku-tiroa editatu"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Alpinismoa"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Alpinismoa editatu"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Piraguismoa"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Piraguismoa editatu"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Txirrindularitza editatu"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Txakur-lasterketak"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Txakur-lasterketak editatu"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Hipika"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Hipika editatu"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Zaldi-lasterketak"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Zaldi-lasterketak editatu"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Gimnasia editatu"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Motor-kirolak"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Motor-kirolak"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Patinajea"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Patinajea editatu"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skate-a"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Skate-parkea editatu"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Igeriketa"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Igeriketa editatu"
@@ -26586,52 +26674,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Eskia editatu"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Eski-pista mota"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "jaitsiera"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "nordikoa"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "snowboard parkea"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Zailtasuna"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "hasiberria"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "erraza"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "aurreratua"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "aditua"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "pistatik kanpo"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Tiro"
@@ -26639,204 +26727,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Tiro-a editatu"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Kirolak (pilota-kirolak)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Futbola"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Futbola editatu"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Futbol australiarra"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Futbol australiarra editatu"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Beisbola"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Beisbola editatu"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Saskibaloia"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Saskibaloia editatu"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golfa"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Golfa editatu"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golf-zelaia"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Boulea"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Boulea editatu"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bola-jokoa"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Bola-jokoa editatu"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Cricket-a"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Cricket-a editatu"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Saredun-cricket-a"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Saredun-cricket-a editatu"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Croquet-a"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Croquet-a editatu"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey-a"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Hockey-a editatu"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Frontoia (Euskal pilota)"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Frontoia (Euskal pilota) editatu"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Erraketa"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Erraketa editatu"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Ping-pong-a editatu"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Tenisa editatu"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Gizakiak-eraikia"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Eraikina"
@@ -26844,5 +26932,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Eraikin-publikoa"
@@ -26850,10 +26938,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Eraikin-publikoa editatu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Udaletxea"
@@ -26861,10 +26949,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Udaletxea editatu"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Enbaxada"
@@ -26872,10 +26960,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Enbaxada editatu"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Epaitegia"
@@ -26884,10 +26972,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Epaitegia editatu"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Gartzela"
@@ -26896,10 +26984,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Gartzela editatu"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Polizia"
@@ -26909,10 +26997,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Polizia editatu"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Suhiltzaile-etxea"
@@ -26921,10 +27009,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Suhiltzaile-etxea editatu"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Postetxea"
@@ -26932,5 +27020,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Postetxea-editatu"
@@ -26938,15 +27026,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Haurreskola"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Haurreskola editatu"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Eskola"
@@ -26954,10 +27042,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Eskola editatu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Unibertsitatea"
@@ -26965,10 +27053,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Unibertsitatea editatu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Batxilergo-eskola"
@@ -26976,5 +27064,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Batxilergo-eskola editatu"
@@ -26982,5 +27070,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Zinema"
@@ -26989,10 +27077,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Zinema editatu"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Liburutegia"
@@ -27001,9 +27089,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Liburutegia editatu"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Arte zentrua"
@@ -27011,10 +27099,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Arte zentrua editatu"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Antzokia"
@@ -27023,10 +27111,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Antzokia editatu"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Gurtze-lekua"
@@ -27036,5 +27124,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Gurtze-lekua editatu"
@@ -27043,6 +27131,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Erlijioa"
@@ -27051,66 +27139,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahaista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "kristaua"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hindua"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "judu"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "musulman"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sij"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastrika"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Sinesmena"
@@ -27119,81 +27207,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglikano"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "katoliko"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "ebanjeliko"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "Jehovaren lekukoak"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormoi"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pentekostal"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "kuakero"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "xii"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "suni"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Helbideak"
@@ -27202,5 +27290,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Helbideak editatu"
@@ -27208,5 +27296,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Eraikinaren atari zenbakia"
@@ -27214,25 +27302,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Eraikinaren izena"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Kale-izena"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Hiriaren izena"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Posta-kodea"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Estatuaren kodea"
@@ -27241,5 +27329,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Helbideen Interpolazioa editatu"
@@ -27247,61 +27335,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Zenbakien-eskema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "bakoitia"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "bikoitia"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alfabetiko"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Gizakiak eraikia"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Lantokia"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Lantokia editatu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Dorrea"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Dorrea editatu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Dorre mota"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "komunikazioa"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "behaketa"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Altuera (metrotan)"
@@ -27309,25 +27397,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Ur-dorrea"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Ur-dorrea editatu"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gasometroa"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Gasometroa"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Itsasargia"
@@ -27335,10 +27423,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Itsasargia editatu"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Haize-errota"
@@ -27346,10 +27434,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Haize-errota editatu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Hodiak"
@@ -27358,41 +27446,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Hodiak editatu"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gasa"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "termikoa"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "olioa"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "hondakin-ura"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "edozein substantzia"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Kokapena"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "urperatua"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "lurrazalean"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Hondakin-uren araztegia editatu"
@@ -27402,10 +27490,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Hondakin-uren araztegia editatu"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Garabia"
@@ -27413,5 +27501,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Garabia editatu"
@@ -27419,10 +27507,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Baliza editatu"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Erpin geodesikoa"
@@ -27430,10 +27518,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Erpin geodesikoa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Zaintza-kamera"
@@ -27441,23 +27529,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Zaintza-kamera editatu"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "barruko"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "kanpoko"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "publikoa"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Energia-sorgailua"
@@ -27467,35 +27555,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Energia sorgailua editatu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "haizea"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "hidrauliko"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "nuklear"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "ikatza"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "fotovoltaiko"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Zentral elektrikoa"
@@ -27504,10 +27592,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Zentral elektrikoa editatu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Azpiestazio elektrikoa"
@@ -27516,5 +27604,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Azpiestazio elektrikoa editatu"
@@ -27522,10 +27610,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Linearen erreferentzia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Elektrizitate-dorrea"
@@ -27536,23 +27624,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Elektrizitate-dorrea editatu"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "dorrea"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "postea"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Dorrearen erreferentzia"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Linea elektrikoa"
@@ -27561,78 +27649,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Linea elektrikoa editatu"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Linea mota"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "Linea"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "behe-tentsioa"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Kable kopurua"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Alanbre kopurua (eroale hobea) kable elektriko bakoitzeko"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "bakuna"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "bikoitza"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "hirukoitza"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Zerbitzuak"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Komunak"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "mugatua"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Oharra"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Gutunontzia"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefonoa"
@@ -27641,5 +27727,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Telefonoa editatu"
@@ -27647,5 +27733,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Txanponak"
@@ -27653,5 +27739,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Oharrak"
@@ -27659,5 +27745,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Errekarga-txartelak eta diru-zorro elektronikoak"
@@ -27665,5 +27751,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Debitu-txartelak"
@@ -27671,15 +27757,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Kreditu-txartelak"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telefono-txartelak"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Birziklapena"
@@ -27688,5 +27774,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Birziklatze-gunea editatu"
@@ -27694,35 +27780,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Bateria"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Ontziak"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Arropak"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Beira"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papera"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Txatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Paperontzia"
@@ -27730,5 +27816,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Paperontzia editatu"
@@ -27737,31 +27823,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Aulkiaren bizkarraldea"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Materiala"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "harria"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plastikoa"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Kolorea"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "beltza"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "marroia"
@@ -27840,39 +27926,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "berdea"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "gorria"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "urdina"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "grisa"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "zuria"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Jarleku kopurua"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Ehiza-postua"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Ehiza-postua editatu"
@@ -27881,30 +27967,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Garaiera"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "baxua"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "erdia"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "beteta"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Esklusa"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Iturria"
@@ -27913,10 +27999,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Iturria editatu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Iturria (edateko ona)"
@@ -27925,10 +28011,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Iturria (edateko ona) editatu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Suteentzako hidrantea"
@@ -27937,5 +28023,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Suteentzako hidrantea editatu"
@@ -27943,5 +28029,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr ""
@@ -27949,15 +28035,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Dendak"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Auto kontzesionarioa"
@@ -27965,10 +28051,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Auto kontzesionarioa editatu"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Bizikleta-denda"
@@ -27977,28 +28063,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Bizikleta-denda editatu"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermerkatua"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Supermerkatua editatu"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Botika"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Botika editatu"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Janari-denda"
@@ -28006,9 +28092,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Janari-denda editatu"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kioskoa"
@@ -28016,27 +28102,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Kioskoa editatu"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Liburudenda"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Liburudenda editatu"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Bidaia-agentzia"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Bidaia-agentzia editatu"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Harategia"
@@ -28044,9 +28130,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Harategia editatu"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Okindegia"
@@ -28054,9 +28140,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Okindegia editatu"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Loradenda"
@@ -28064,18 +28150,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Loradenda editatu"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Produktu organikoen denda"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Produktu organikoen denda"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Alkohola"
@@ -28083,54 +28169,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Alkoholdun edarien denda editatu"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Edariak"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Edari-denda editatu"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Ordenagailua"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Ordenagailu-denda editatu"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Elektronika-denda editatu"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "HI-FI"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "HI-FI denda editatu"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Altzariak"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Altzari-denda editatu"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Lorezaintza zentrua"
@@ -28138,9 +28224,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Lorezaintza zentrua editatu"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Burdindegia"
@@ -28148,9 +28234,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Burdindegia editatu"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Brikolaje-denda"
@@ -28158,54 +28244,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Brikolaje denda editatu"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Paper-denda"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Paper-denda editatu"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Ileapaindegia"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Ileapaindegia editatu"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Zapatak"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Zapata-denda editatu"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Jostailuak"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Jostailu-denda editatu"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Bideoa"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Bideo-denda editatu"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Tindategia"
@@ -28213,9 +28299,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Tindategia editatu"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Garbitegia"
@@ -28223,9 +28309,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Garbitegia editatu"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Kanpoko aktibitateen denda"
@@ -28233,24 +28319,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Kanpoko aktibitateen denda editatu"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Kiroldenda editatu"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Optika"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Optika editatu"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Makina-saltzailea"
@@ -28258,5 +28344,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Makina-saltzailea editatu"
@@ -28264,97 +28350,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Produktuen makina-saltzailea"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "garraio publikoko txartelak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "garraio publikoaren mapak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "aparkalekuko txartelak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "Elikadura"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "edariak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "gozokiak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "zigarretak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "argazkiak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "animalientzako janaria"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "egunkariak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "jostailuak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "seiluak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM txartelak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "Telefono-txartelak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "Bonuak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "kondoiak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tanpoiak"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "gorotz-poltsa"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Fideltasun edo deskontu txartelak"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Dirua"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Banku"
@@ -28362,14 +28448,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Bankua editatu"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Kutxazain automatikoa"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Diru-trukea"
@@ -28377,5 +28463,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Diru-trukea editatu"
@@ -28383,15 +28469,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Kutxazain automatikoa editatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Osasuna"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Medikuak"
@@ -28399,18 +28485,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Medikuak editatu"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Dentista editatu"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Botika"
@@ -28418,5 +28504,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Botika editatu"
@@ -28424,9 +28510,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Medikuaren errezetarekin saltzen dute"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Ospitalea"
@@ -28434,10 +28520,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Ospitalea editatu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Larrieldietarako sarrera puntua"
@@ -28446,5 +28532,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Larrieldietarako sarrera puntua editatu"
@@ -28453,20 +28539,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Puntu-zenbakia"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Puntuaren izena"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Telefono Zenbakia"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Erabili nazioarteko kodea, hala nola +12-345-67890)"
@@ -28474,5 +28560,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Albaitaria"
@@ -28481,64 +28567,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Albaitaria editatu"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Lekuak"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Kontinentea"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Kontinentea editatu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Herrialdea"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Herrialdea editatu"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Estatua"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Estatua editatu"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Erregioa"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Erregioa editatu"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Eskualdea"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Eskualdea editatu"
@@ -28546,15 +28632,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Hiria (100.000 biztanle baino gehiago)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Hiria (100.000 biztanle baino gehiago) editatu"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Herria (10.000 - 100.000 biztanle)"
@@ -28562,10 +28648,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Herria (10.000 - 100.000 biztanle) editatu"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Auzoa"
@@ -28573,25 +28659,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Auzoa editatu"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Herria (10.000 biztale baino gutxiago)"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Herria (10.000 biztale baino gutxiago) editatu"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Auzoa (mendialdean eta egoten direnak)"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Auzoa (mendialdean eta egoten direnak) editatu"
@@ -28599,5 +28685,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Ingurua (leku geografikoa)"
@@ -28605,10 +28691,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Ingurua (leku geografikoa) editatu"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Irla"
@@ -28616,10 +28702,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Irla editatu"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Irlatxoa"
@@ -28627,5 +28713,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Irlatxoa editatu"
@@ -28633,5 +28719,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Kobazuloaren sarrera"
@@ -28639,10 +28725,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Kobazuloaren sarrera editatu"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Mendi-tontorra"
@@ -28650,10 +28736,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Mendi-tontorra editatu"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Glaziarra"
@@ -28661,10 +28747,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Glaziarra editatu"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Sumendia"
@@ -28672,70 +28758,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Sumendia editatu"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Mugak"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Nazionala"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Muga nazionala editatu"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administratiboa"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Muga administratiboa editatu"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Zibila"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Muga zibila editatu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Politikoa"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Muga politikoa editatu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Parke nazionala"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Parke nazionala editatu"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Lurzorua"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Zuhaitza"
@@ -28744,15 +28830,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Zuhaitza editatu"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Izen-botanikoa"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Basoa"
@@ -28761,5 +28847,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Basoa editatu"
@@ -28767,17 +28853,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "konifero"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "hostoerorkorra"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "misto"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Basoa"
@@ -28786,14 +28872,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Basoa editatu"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Natura-erreserba"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Natura-erreserba editatu"
@@ -28801,25 +28887,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Harritza"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Harritza editatu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Sastraka"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Sastraka editatu"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr ""
@@ -28827,10 +28913,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Txilardi"
@@ -28838,5 +28924,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Txilardia editatu"
@@ -28844,5 +28930,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Etxaldea"
@@ -28851,45 +28937,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Etxalde-gunea editatu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Nekazaritza-lurra"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Nekazaritza-lurrak editatu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Belardia"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Belardia editatu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Mahastia"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Mahastia editatu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Soroak"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Soroak editatu"
@@ -28897,25 +28983,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Lorategia"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Lorategia editatu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Belarra"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Belardia editatu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Udal-parkea"
@@ -28923,10 +29009,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Udal-parkea editatu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Amankomuna"
@@ -28934,20 +29020,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Amankomuna editatu"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Parkea"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Parkea editatu"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Aisialdi-gunea"
@@ -28955,5 +29041,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Aisialdi-gunea editatu"
@@ -28961,15 +29047,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Bizitegi-gunea"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Bizitegi-gunea editatu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Hilerria (txikia)"
@@ -28977,9 +29063,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Hilerria (txikia) editatu"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Hilerria"
@@ -28987,39 +29073,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Hilerria editatu"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Merkataritza"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Merkataritza-gunea editatu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Bulegoak"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Bulego-eremua editatu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industriala"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Industrialdea editatu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Trenbide-eremua"
@@ -29027,15 +29113,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Trenbide-eremua editatu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Militarra"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Eremu militarra editatu"
@@ -29043,50 +29129,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Eraikitze-eremua"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Eraikitze-eremua editatu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Lugorria"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Lugorria editatu"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Eraikitzeko lurzorua"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Eraikitzeko lurzorua editatu"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Zabortegia"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Editatu zabortegia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Harrobia"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Harrobia editatu"
@@ -29096,5 +29182,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Multipoligonoa editatu"
@@ -29106,5 +29192,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "kanpoko segmentua"
@@ -29112,5 +29198,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "barruko segmentua"
@@ -29118,5 +29204,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr "Muga"
@@ -29127,5 +29213,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr "Muga editatu"
@@ -29133,36 +29219,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr "Muga mota"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr "administratiboa"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr "nazionala"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr "zibila"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr "politikoa"
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr "Maila administratiboa"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr "Azpi-area"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr "Administrazio gunea"
@@ -29170,5 +29256,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Biraketa debekua"
@@ -29177,5 +29263,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Biraketa debekua editatu"
@@ -29183,34 +29269,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Debekua"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "ezkerrera biratzea debekatua"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "eskuinera biratzea debekatua"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "zuzen jarraitzea debekatua"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "U biraketa egitea debekatua"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "soilik eskuinera biratzea"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "soilik ezkerrera biratzea"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "aurrerantz soilik"
@@ -29219,15 +29305,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "norabide honetatik"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "nodo edo bide honetan zehar"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "bide honetara"
@@ -29235,5 +29321,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Bidea"
@@ -29242,5 +29328,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Bidea editatu"
@@ -29248,5 +29334,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Bide mota"
@@ -29354,5 +29440,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29363,17 +29449,17 @@
 msgstr "bizikleta"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "autobusa"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "errepidea"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "ski"
@@ -29441,5 +29527,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29449,9 +29535,9 @@
 msgstr "oinezkoa"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "tranbia"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "desbideratzea"
@@ -29465,10 +29551,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metroa"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Sinboloaren deskribapena"
@@ -29476,31 +29562,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Sarea"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Estatuko bidea"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "proposatutako"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "txandakatu"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "behin-behineko"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "lotura"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Kolorea (hex)"
@@ -29509,30 +29595,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "ibilbidearen segmentua"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "hurrengo segmentua"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "aurreko segmentua"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "geldialdi puntua"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "hurrengo geldialdi puntua"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "aurreko geldialdi puntua"
@@ -29759,5 +29845,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "zaharkitua"
@@ -30410,4 +30496,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30511,11 +30605,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "gizakiak eraikia"
@@ -31028,5 +31122,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "kaia"
@@ -31040,5 +31134,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "hodia"
@@ -31182,13 +31276,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "aisia"
@@ -31202,5 +31296,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "itsas-portua"
@@ -31296,10 +31390,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "zerbitzuak"
@@ -31401,10 +31495,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "zerbitzua_trafikoa"
@@ -31842,24 +31936,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "zerbitzua_argiztapena"
@@ -31891,6 +31985,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "ura (argia)"
@@ -31951,8 +32045,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "osasuna"
@@ -32305,26 +32399,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "denda"
@@ -32396,8 +32490,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -32498,9 +32592,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turismoa"
@@ -32588,9 +32682,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "ondare historikoa"
@@ -32603,5 +32697,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "harrobia"
@@ -32615,5 +32709,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "zabortegia"
@@ -32635,5 +32729,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "dartsena"
@@ -32647,5 +32741,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "etxaldea"
@@ -32668,5 +32762,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "txikizkako merkataritza"
@@ -32680,5 +32774,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "industriala"
@@ -32692,5 +32786,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "hustutako industrialdea"
@@ -32704,5 +32798,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "lurzoru eraikigarria"
@@ -32716,5 +32810,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "tren-ingurunea"
@@ -32771,7 +32865,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "gune militarra"
@@ -32785,5 +32879,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "kanposantu"
@@ -32796,5 +32890,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "gailurra"
@@ -32809,5 +32903,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "glaziar"
@@ -32821,5 +32915,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "sumendia"
@@ -32874,8 +32968,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "natura-gune"
@@ -32889,5 +32983,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "sasi"
@@ -32901,5 +32995,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "mendia"
@@ -32913,5 +33007,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "basoa"
@@ -32925,5 +33019,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "lokatza"
@@ -32937,5 +33031,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "hondartza"
@@ -33013,8 +33107,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "ibilbidea"
@@ -33103,12 +33197,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "muga"
@@ -33258,11 +33352,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "lekua"
@@ -33276,5 +33370,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "TIGER_datuak"
@@ -33630,4 +33724,12 @@
 msgstr "Sizilia - Italia"
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Aukeratutako bidean ez dago aukeratutako nodoa."
+#~ msgstr[1] "Aukeratutako bidean ez daude aukeratutako nodoak."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Graduak Minutuak Segundoak"
+
 #~ msgid "Football"
 #~ msgstr "Futbol amerikarra"
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 22568)
+++ applications/editors/josm/i18n/po/fi.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-21 15:47+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 11:51+0000\n"
 "Last-Translator: Mika Laari <laari@iki.fi>\n"
 "Language-Team: Finnish <fi@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-07-28 09:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -231,5 +230,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -245,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -263,11 +262,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -275,20 +275,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -321,5 +321,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Yhdistä"
@@ -389,5 +389,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -401,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -421,4 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -435,6 +436,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -446,5 +447,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -579,22 +580,22 @@
 msgstr "Ladataan avonaiset muutoskokoelmat..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Yhdistä polkuja"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Yhdistää monta polkua yhdeksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Vaihdetaanko suuntia?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Käännä ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -603,5 +604,5 @@
 "Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -610,10 +611,10 @@
 "Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Yhdistä {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Valitse ainakin kaksi yhdistettävää polkua."
@@ -660,10 +661,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -801,5 +802,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -865,10 +866,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "GPX-vienti..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Vie data GPX-tiedostoon."
@@ -1060,5 +1061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1497,20 +1498,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1534,5 +1535,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1543,6 +1544,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Virhe"
@@ -1569,5 +1570,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1575,5 +1576,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Tallenna tämänhetkinen data."
@@ -1630,10 +1631,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Tallenna data uuteen tiedostoon."
@@ -1678,5 +1679,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1703,5 +1704,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Ei, peruuta"
@@ -1770,18 +1771,24 @@
 msgstr[1] "Yksinkertaista polku (poista {0} pistettä)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Katkaise polku"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Katkaisee polun valitun pisteen kohdalta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Valintaa ei voida käyttää jakamiseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Valitut pisteet eivät ole samalla polulla."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1789,5 +1796,5 @@
 msgstr[1] "Valitut pisteet eivät ole keskellä mitään polkua."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1803,20 +1810,10 @@
 "valitse myös polku jonka haluat katkaista."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Valitut pisteet eivät ole samalla polulla."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Valittu polku ei sisällä valittua pistettä."
-msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1826,5 +1823,5 @@
 "pisteitä, jotka eivät ole polun päissä.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1834,5 +1831,5 @@
 "<br>Sinun tulisi tarkistaa, että jäsenyydet ovat oikein.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1842,5 +1839,5 @@
 "tulisi tarkistaa, että jäsenyydet ovat oikein.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1992,5 +1989,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3024,22 +3021,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3185,25 +3182,25 @@
 msgstr "Ristiriitaa ei voi ratkaista, koska päätös puuttuu"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr "Pitäisi olla ainakin yksi poistettava kohde, saatiin tyhjä kokoelma"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Poista piste {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Poista polku {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Poistetaan relaatio {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3212,5 +3209,5 @@
 msgstr[1] "Poista {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3219,5 +3216,5 @@
 msgstr[1] "Poista {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3226,5 +3223,5 @@
 msgstr[1] "Poista {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3233,5 +3230,5 @@
 msgstr[1] "Poistetaan {0} relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3388,5 +3385,5 @@
 msgstr "Toteutav"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3471,7 +3468,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Virhe luotaessa välimuistihakemistoa: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3666,42 +3663,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Asteina, minuutteina ja sekunteina"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Projisoidut koordinaatit"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "E"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "P"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "L"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "I"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3709,5 +3709,5 @@
 msgstr "Objektia {0} ei voi lisätä datajoukkoon, koska se kuuluu jo siihen"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3886,5 +3886,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "tausta"
@@ -4032,5 +4032,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Älä näytä uudestaan (muistaa valinnan)"
@@ -4058,5 +4058,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "rata"
@@ -4078,6 +4078,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4146,5 +4146,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "rakennus"
@@ -4231,5 +4231,5 @@
 msgstr "Objekti poistettu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4330,69 +4330,69 @@
 msgstr "Salasana"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "käyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "valinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Näytä tämä ohje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "UNIX-standardin mukainen geometria"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Lataa rajattu alue"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Lataa URLissa annettu alue (lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Avaa tiedosto (mitä tahansa Tiedosto/Avaa-valikon tuntemaa tyyppiä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Lataa rajattu alue raaka-GPS:nä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Lataa URLissa annettu alue (lat=x&lon=y&zoom=z) raaka-GPS:nä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Valitse haun tulokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Käynnistä suurennettuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Palauta oletusasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Aseta kieli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "Javan järjestelmäominaisuuksina näkyvät asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/polku/josmin/hakemistoon/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Vaihda kaikkien käyttäjäasetuksien kansio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4405,9 +4405,9 @@
 "Java-asetus, joka määrää suurimman käytettävän muistimäärän megatavuina."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "esimerkkejä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4417,46 +4417,45 @@
 "järjestyksessä."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Muista ladata dataa, jos käytät --selection-valitsinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Alustetaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Päivitetään liitännäisiä..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Asennetaan päivitetyt liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Ladataan aikaisia liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Asetetaan oletuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Luodaan pääikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Ladataan liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Selvitä"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4465,5 +4464,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4559,33 +4558,33 @@
 msgstr "Loitonna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "skaalaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Pituusaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Osoittmen kohdalla olevan objektin nimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Leveysaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Edellisen ja tämänhetkisen segmentin välinen kulma."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Piirrettävän segmentin suuntima."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Piirrettävän segmentin pituus."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4595,9 +4594,9 @@
 "nappia pohjassa.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(ei objektia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4613,4 +4612,18 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Tason \"{0}\" tulee olla tasolistassa"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+msgid "Metric"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "kiinalainen"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Toimistoalue"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5356,5 +5369,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "kaikki"
@@ -5437,6 +5450,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5447,5 +5460,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5589,5 +5602,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Muutoskokoelmat"
@@ -5649,5 +5662,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5806,5 +5819,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5812,5 +5825,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5818,5 +5831,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5824,5 +5837,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5830,5 +5843,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5837,5 +5850,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5843,5 +5856,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5849,5 +5862,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5855,24 +5868,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Suodatus päällä</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> kohdetta piilossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> kohdetta himmeänä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5953,51 +5966,51 @@
 msgstr "Sulje ikkuna luomatta uutta pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Tasot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Avaa lista kaikista ladatuista tasoista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Poista valitut tasot."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Näytä/piilota valittu taso."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Näytä/piilota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Näytä/piilota valittu taso."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Aktivoi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Aktivoi valittu taso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Yhdistä tämä taso toiseen tasoon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Monista tämä taso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Siirrä valittu taso rivi ylöspäin."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Siirrä valittu taso rivi alaspäin."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Tietoja tasosta"
@@ -6007,5 +6020,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relaatiot"
@@ -7162,6 +7175,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7209,107 +7223,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Nimi"
@@ -7648,5 +7662,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7733,5 +7747,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<eri>"
@@ -8489,5 +8503,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8560,8 +8574,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Tyyppi"
@@ -8590,6 +8604,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "tuntematon"
@@ -8923,5 +8937,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Ristiriitoja"
@@ -8992,14 +9006,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Virheellinen kommentti"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "Muutoskokoleman id:"
@@ -9439,5 +9454,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Lähetä"
@@ -9459,5 +9474,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9465,60 +9480,93 @@
 msgstr "Asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Uuden muutoskokoelman tagit"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Muuta lisäasetuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Lähetä muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Lähetä muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Virheellinen kommentti"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Käännä järjestys"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Jatka"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Älä näytä uudelleen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Peruuta lähetys ja jatka muokkausta"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9858,103 +9906,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "gps-piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Muokkaa viivanpiirtotyyliä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Käytä globaaleja asetuksia."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Viivanpiirtoasetukset"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Muokkaa väriä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Oletusarvo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Valitse väri"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Tuo äänitiedosto"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Ääniaaltotiedostot (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Tuo kuvia"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9962,5 +9918,5 @@
 msgstr "Nimi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9968,5 +9924,5 @@
 msgstr "Kuvaus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9976,23 +9932,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Pituus: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10001,5 +9957,5 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10008,10 +9964,10 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10021,21 +9977,21 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10043,10 +9999,10 @@
 msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10054,10 +10010,10 @@
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10065,21 +10021,21 @@
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10089,9 +10045,9 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10099,5 +10055,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10105,23 +10061,115 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Muokkaa viivanpiirtotyyliä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Käytä globaaleja asetuksia."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Viivanpiirtoasetukset"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Muokkaa väriä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Oletusarvo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Valitse väri"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Tuo äänitiedosto"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Ääniaaltotiedostot (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Tuo kuvia"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datataso {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "ladatun alueen ulkopuolella"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10130,11 +10178,11 @@
 msgstr[1] "Havaittiin {0} ristiriitaa."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10143,36 +10191,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} koostuu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Muuta GPX-tasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10182,5 +10230,5 @@
 "<br>If you want to upload traces, look here:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10189,5 +10237,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10195,5 +10243,5 @@
 msgstr[1] "pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10202,5 +10250,5 @@
 msgstr[1] "jälki, jossa on {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10209,5 +10257,5 @@
 msgstr[1] "{0}:ssä on {1} jälkeä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10216,24 +10264,28 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Sijoittele GPX-tiedoston mukaisesti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Virhe tulkittaessa {0}:aa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ei voitu lukea \"{0}\":aa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10244,34 +10296,34 @@
 "kuva.<br>Syötä kuvassa näkyvä kellonaika ja valitse aikavyöhyke.<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Kuvausaika (kuvan EXIF-tiedoista):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "GPS:n aika (lue ylläolevasta kuvasta): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [pp/kk/vvvv tt:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Ei päivämäärää"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Avaa toinen kuva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10281,93 +10333,93 @@
 "Ole hyvä ja syötä aika pyydetyssä muodossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Virheellinen päivämäärä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Ei ladattuja GPS-jälkiä>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX-jälki: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Avaa toinen GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Aikavyöhyke: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Kohdista kuvia GPX-jälkeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Virheellinen aikavyöhyke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10377,20 +10429,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10399,5 +10451,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10405,21 +10457,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10428,17 +10480,17 @@
 "Valittu GPX-jälki ei sisällä aikaleimoja. Ole hyvä ja valitse toinen jälki."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Valitse GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "GPX-jälkeä ei valittuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10447,5 +10499,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10454,56 +10506,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Tutkii hakemistoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Luetaan kuvia..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Luetaan {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tutkii hakemistoa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geo-merkityt kuvat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Sijoittele GPX-tiedoston mukaisesti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10512,5 +10560,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10519,10 +10567,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10531,5 +10579,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10629,9 +10677,9 @@
 msgstr "JPEG-kuvat (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10639,5 +10687,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10646,14 +10694,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Tahdista ääni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Pysäytä äänentoisto, kun kuulet tahdistusmerkkisi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10661,29 +10721,17 @@
 msgstr "Ääni tahdistettu pisteessä {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
@@ -11528,4 +11576,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Ei mitään"
@@ -11540,5 +11589,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "Piirrä ympyrä HDOP-arvosta"
@@ -11641,5 +11690,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Vain kiinnostavat suuntatiedot (esim. yksisuuntaiset kadut)."
@@ -11647,5 +11696,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Vain polun päähän."
@@ -11675,5 +11724,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Tekijä"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Vene"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11681,9 +11744,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Piirrä viivat GPS-pisteiden välille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11693,9 +11756,9 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11704,20 +11767,20 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Enimmäispituus (metreinä)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Piirrä GPS-pisteitä yhdistäviin viivoihin suuntanuolet"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11725,5 +11788,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11731,13 +11794,13 @@
 msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Vähimmäisetäisyys (pikseleinä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Piirrä isommat pisteet GPS-pisteille"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11747,9 +11810,9 @@
 "tason ominaisuuksista."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Värittää pisteet ja jäljen segmentit nopeuden mukaan."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11757,37 +11820,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Nopeusvärityksen valinta eri keskinopeuksille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Jäljen ja pisteiden väritys"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "WayPoint-kuva"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS-pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Piirrä suuntanuolet polkujen segmenteille."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Piirrä polkujen segmenteille järjestysnumerot."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Piirrä palvelimelta ladatun datan alueen reunat."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11795,9 +11867,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Piirrä epäaktiiviset tasot eri värillä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -12153,21 +12225,26 @@
 "käyttöön."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Projektiometodi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Näytä koordinaatit"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Projektiometodi"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Taso, jolla tehdään mittaukset"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Karttaprojektio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12718,5 +12795,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12725,49 +12802,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Lisää tietoja tästä ominaisuudesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Lisäominaisuudet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tuntematon tyyppi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12777,15 +12854,15 @@
 msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Virhe käsiteltäessä {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12795,17 +12872,17 @@
 msgstr[1] "Muuta {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Ei mitään valittuna!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Valinta ei ole sopiva!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12823,7 +12900,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Etsi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12832,17 +12908,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Etsi kohteita."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Sovita näkymä valintaan"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Etsi kohteita."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13143,5 +13216,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
@@ -14612,5 +14685,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14879,5 +14952,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -15219,41 +15292,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15270,25 +15343,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15326,18 +15399,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Rakennukset"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15561,8 +15634,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "vesi"
@@ -15623,6 +15696,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "osoite"
@@ -16088,34 +16161,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Tyhjä taso"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16124,14 +16197,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -16208,22 +16281,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Lataa objekti..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Lataa valittujen relaatioiden kaikki jäsenet"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Lataa nyt"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Valitse vähintään yksi ladattava tietolaji."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16233,12 +16302,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Testi {0}/{1}: Aloitetaan {2}"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Ladataan {0}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16269,9 +16338,9 @@
 msgstr "Luo kopio polusta"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -16281,5 +16350,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -16288,11 +16357,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Tuo jälki GPX-tasolta"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Poista olemassa oleva jälki"
@@ -16302,5 +16371,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "GPX-tasoa ei löytynyt."
@@ -16310,13 +16379,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16555,5 +16624,5 @@
 msgstr "Näytä kuvat, joita ei ole geo-merkitty"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Tuodut kuvat"
@@ -16912,8 +16981,6 @@
 msgstr "Avaa mittausikkuna."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Nollaa"
@@ -16944,5 +17011,5 @@
 msgstr "Kahden pisteen välinen kulma"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Taso, jolla tehdään mittaukset"
@@ -17034,5 +17101,5 @@
 msgstr "OpenStreetBugs-latauslooppi"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Näyttä OpenStreetBugs-ongelmat"
@@ -17100,13 +17167,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17220,93 +17287,93 @@
 msgstr ""
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -17348,9 +17415,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17528,20 +17595,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "Yhdistetty versio"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "varmista kaikki etähallinnan toimenpiteet käsin"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Liitännäinen, joka antaa muiden sovellusten hallita JOSM:ia."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Etähallinta"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Asetukset etähallintaliitännäiselle."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17552,50 +17624,58 @@
 "ohjelmat ottavat yhteyttä tähän porttiin, joten porttinumeroa ei voi vaihtaa."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Sallitut toiminnot"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Etähallinta on pyytänyt datan lataamista API:sta."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Pyynnös tiedot: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Sallitaanko tämä?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Varmista etähallinnan toimenpide"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17603,5 +17683,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Palauta"
@@ -17800,41 +17880,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -18134,4 +18214,14 @@
 msgid "Terrace"
 msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Erotin"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18818,6 +18908,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18827,9 +18917,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18908,6 +18998,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18915,5 +19005,5 @@
 msgstr "Tarkistusvirheet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Ei virheitä"
@@ -19156,32 +19246,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Päällekkäiset pisteet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19218,5 +19302,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr ""
@@ -19747,5 +19831,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "alue"
@@ -19883,10 +19967,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -20032,10 +20116,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20221,28 +20305,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automaattinen lataus"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20253,17 +20333,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20272,48 +20352,52 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Virhe ladattaessa tiedostoa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automaattinen lataus"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20392,5 +20476,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20425,5 +20509,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20444,5 +20528,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "talousmetsä"
@@ -20461,22 +20545,19 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "raja"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Mittaukset"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "Putki"
+msgstr ""
 
 #. relation type
@@ -20488,43 +20569,37 @@
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Taideteos"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "julkinen liikenne"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Kielto"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "reitti"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Liitä"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "vesiväylä"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20798,7 +20873,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20995,6 +21069,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21003,5 +21082,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21010,5 +21089,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21017,10 +21096,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21029,5 +21108,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21037,5 +21116,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21044,15 +21123,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21061,5 +21140,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21192,5 +21271,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Numero"
@@ -21729,5 +21808,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21740,5 +21819,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "metsä"
@@ -22042,9 +22121,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "kyllä"
@@ -22154,9 +22233,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "ei"
@@ -22415,5 +22494,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "asuinkatu"
@@ -22462,5 +22541,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr ""
@@ -22495,5 +22574,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr ""
@@ -22580,5 +22659,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr ""
@@ -22613,5 +22692,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22781,14 +22860,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operaattori"
@@ -23056,6 +23135,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Korkeus"
@@ -23503,5 +23582,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "suo"
@@ -23907,5 +23986,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Jännite"
@@ -24269,31 +24348,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Aukioloajat"
@@ -24353,90 +24432,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24549,7 +24628,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr ""
@@ -24565,5 +24644,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "maanalainen"
@@ -24576,6 +24655,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Maksu"
@@ -24751,5 +24830,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Pyörätuoli"
@@ -24786,6 +24865,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr ""
@@ -24793,5 +24872,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Penkki"
@@ -24910,5 +24989,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Loisto"
@@ -25069,5 +25148,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr ""
@@ -25075,73 +25154,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italialainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -25149,17 +25233,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Kahvila"
@@ -25167,9 +25251,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Muokkaa kahvilan ominaisuuksia"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr ""
@@ -25177,18 +25261,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr ""
@@ -25196,9 +25281,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Yökerho"
@@ -25206,24 +25291,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Muokkaa yökerhon ominaisuuksia"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museo"
@@ -25231,9 +25316,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Muokkaa museon ominaisuuksia"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -25242,9 +25327,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Muokkaa eläintarhan ominaisuuksia"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -25252,24 +25337,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Teemapuisto"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Taideteos"
@@ -25277,5 +25362,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr ""
@@ -25283,19 +25368,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Kartta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -25333,5 +25418,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25339,28 +25424,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -25370,5 +25455,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -25376,5 +25461,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr ""
@@ -25382,6 +25467,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Pyöräily"
@@ -25389,5 +25474,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -25395,6 +25480,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr ""
@@ -25402,5 +25487,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -25408,46 +25493,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25455,29 +25547,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr ""
@@ -25485,25 +25577,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Piknik-paikka"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Linna"
@@ -25512,19 +25604,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -25533,9 +25625,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Taistelukenttä"
@@ -25543,10 +25635,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25554,5 +25646,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25560,15 +25652,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -25576,55 +25668,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -25632,35 +25724,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Liikunta"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Liikuntapaikka"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -25674,6 +25766,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -26089,31 +26181,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "urheilu"
@@ -26123,240 +26215,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskusta"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr ""
@@ -26398,23 +26490,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "tyyppi"
@@ -26456,211 +26548,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "kenttä"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "urheilukeskus"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Moottoriurheilu"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Unti"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr ""
@@ -26668,52 +26760,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Ammunta"
@@ -26721,204 +26813,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Keinotekoiset"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Rakennus"
@@ -26926,5 +27018,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -26932,10 +27024,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -26943,10 +27035,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -26954,10 +27046,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -26966,10 +27058,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Vankila"
@@ -26978,10 +27070,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Poliisiasema"
@@ -26991,10 +27083,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -27003,10 +27095,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -27014,5 +27106,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -27020,15 +27112,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Koulu"
@@ -27036,10 +27128,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Yliopisto"
@@ -27047,10 +27139,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Korkeakoulu"
@@ -27058,5 +27150,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -27064,5 +27156,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -27071,10 +27163,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Kirjasto"
@@ -27083,9 +27175,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -27093,10 +27185,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Teatteri"
@@ -27105,10 +27197,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr ""
@@ -27118,5 +27210,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr ""
@@ -27125,6 +27217,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Uskonto"
@@ -27133,66 +27225,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr ""
@@ -27201,81 +27293,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Osoitteet"
@@ -27284,5 +27376,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Muokkaa osoitetietoja"
@@ -27290,5 +27382,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Talon numero"
@@ -27296,25 +27388,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Kadunnimi"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Maakoodi"
@@ -27323,5 +27415,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Muokkaa interpolointilinjaa"
@@ -27329,61 +27421,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "pariton"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Tehdas"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Torni"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -27391,25 +27483,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -27417,10 +27509,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -27428,10 +27520,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Putki"
@@ -27440,41 +27532,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "kaasu"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -27484,10 +27576,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Nosturi"
@@ -27495,5 +27587,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
@@ -27501,10 +27593,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr ""
@@ -27512,10 +27604,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -27523,23 +27615,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr ""
@@ -27549,35 +27641,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr ""
@@ -27586,10 +27678,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -27598,5 +27690,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -27604,10 +27696,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -27618,23 +27710,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -27643,78 +27735,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "Putki"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "moottoritien_ramppi"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Käymälä"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Puhelin"
@@ -27723,5 +27813,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -27729,5 +27819,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Kolikot"
@@ -27735,5 +27825,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr ""
@@ -27741,5 +27831,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27747,5 +27837,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr ""
@@ -27753,15 +27843,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -27770,5 +27860,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -27776,35 +27866,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Romumetalli"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27812,5 +27902,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27819,31 +27909,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr ""
@@ -27922,39 +28012,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
@@ -27963,30 +28053,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Lähde"
@@ -27995,10 +28085,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -28007,10 +28097,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -28019,5 +28109,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28025,5 +28115,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr ""
@@ -28031,15 +28121,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -28047,10 +28137,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Muokkaa autokaupan ominaisuuksia"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -28059,28 +28149,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Pyöräkauppa"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -28088,9 +28178,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Muokkaa lähikaupan tietoja"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kioski"
@@ -28098,27 +28188,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Muokkaa kioskin ominaisuuksia"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Matkatoimisto"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Muokkaa matkatoimistoa"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Lihakauppa"
@@ -28126,9 +28216,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Muokkaa lihakaupan ominaisuuksia"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Leipomo"
@@ -28136,9 +28226,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Muokkaa leipomon ominaisuuksia"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr ""
@@ -28146,18 +28236,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Luomukauppa"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Muokkaa luomukaupan ominaisuuksia"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr ""
@@ -28165,54 +28255,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr ""
@@ -28220,9 +28310,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr ""
@@ -28230,9 +28320,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -28240,54 +28330,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Kampaamo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -28295,9 +28385,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Muokkaa kuivapesulan ominaisuuksia"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Pesula"
@@ -28305,9 +28395,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Muokkaa pesulan ominaisuuksia"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr ""
@@ -28315,24 +28405,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Muokkaa urheiluvälinekauppaa"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Muokkaa optikon ominaisuuksia"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -28340,5 +28430,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -28346,97 +28436,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "julkisen liikenteen lippuja"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "julkisen liikenteen aikatauluja"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Pankki"
@@ -28444,14 +28534,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -28459,5 +28549,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -28465,15 +28555,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -28481,18 +28571,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -28500,5 +28590,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -28506,9 +28596,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Sairaala"
@@ -28516,10 +28606,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr ""
@@ -28528,5 +28618,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28535,20 +28625,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28556,5 +28646,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -28563,64 +28653,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Maantiede"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Paikat"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Osavaltio"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Seutu"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr ""
@@ -28628,15 +28718,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Suurkaupunki"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Muokkaa suurkaupungin ominaisuuksia"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Kaupunki"
@@ -28644,10 +28734,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -28655,25 +28745,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Kunta"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
@@ -28681,5 +28771,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr ""
@@ -28687,10 +28777,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Saari"
@@ -28698,10 +28788,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -28709,5 +28799,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -28715,5 +28805,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -28721,10 +28811,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Huippu"
@@ -28732,10 +28822,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Muokkaa huipun ominaisuuksia"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -28743,10 +28833,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -28754,70 +28844,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Kansallinen"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Puu"
@@ -28826,15 +28916,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Metsä"
@@ -28843,5 +28933,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Muokkaa metsän ominaisuuksia"
@@ -28849,17 +28939,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "havumetsä"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -28868,14 +28958,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -28883,25 +28973,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Tunturi"
@@ -28909,10 +28999,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Muokkaa tunturin ominaisuuksia"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Nummi"
@@ -28920,5 +29010,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Muokkaa nummen ominaisuuksia"
@@ -28926,5 +29016,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -28933,45 +29023,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -28979,25 +29069,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -29005,10 +29095,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr ""
@@ -29016,20 +29106,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Puisto"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr ""
@@ -29037,5 +29127,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29043,15 +29133,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -29059,9 +29149,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -29069,39 +29159,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -29109,15 +29199,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -29125,50 +29215,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
@@ -29178,5 +29268,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29188,5 +29278,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr ""
@@ -29194,5 +29284,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr ""
@@ -29200,5 +29290,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -29209,5 +29299,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -29215,36 +29305,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29252,5 +29342,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr ""
@@ -29259,5 +29349,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29265,34 +29355,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr ""
@@ -29301,15 +29391,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr ""
@@ -29317,5 +29407,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr ""
@@ -29324,5 +29414,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr ""
@@ -29330,5 +29420,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr ""
@@ -29436,5 +29526,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29445,17 +29535,17 @@
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29523,5 +29613,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29531,9 +29621,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr ""
@@ -29547,10 +29637,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr ""
@@ -29558,31 +29648,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr ""
@@ -29591,30 +29681,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29841,5 +29931,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr ""
@@ -30492,4 +30582,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30593,11 +30691,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr ""
@@ -31110,5 +31208,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "laituri"
@@ -31122,5 +31220,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr ""
@@ -31264,13 +31362,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr ""
@@ -31284,5 +31382,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr ""
@@ -31378,10 +31476,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr ""
@@ -31483,10 +31581,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -31924,24 +32022,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -31973,6 +32071,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -32033,8 +32131,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr ""
@@ -32387,26 +32485,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "kauppa"
@@ -32478,8 +32576,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotelli"
@@ -32580,9 +32678,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turismi"
@@ -32670,9 +32768,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "historiallinen"
@@ -32685,5 +32783,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "louhos"
@@ -32697,5 +32795,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "kaatopaikka"
@@ -32717,5 +32815,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "valuma-alue"
@@ -32729,5 +32827,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr ""
@@ -32750,5 +32848,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "kaupallinen"
@@ -32762,5 +32860,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "teollisuus"
@@ -32774,5 +32872,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr ""
@@ -32786,5 +32884,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr ""
@@ -32798,5 +32896,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "rata-alue"
@@ -32853,7 +32951,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "armeija"
@@ -32867,5 +32965,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "hautausmaa"
@@ -32878,5 +32976,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "huippu"
@@ -32891,5 +32989,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "jäätikkö"
@@ -32903,5 +33001,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "tulivuori"
@@ -32956,8 +33054,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr ""
@@ -32971,5 +33069,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "pusikko"
@@ -32983,5 +33081,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "nummi"
@@ -32995,5 +33093,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -33007,5 +33105,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "muta"
@@ -33019,5 +33117,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "ranta"
@@ -33095,8 +33193,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "reitti"
@@ -33185,12 +33283,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "raja"
@@ -33340,11 +33438,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr ""
@@ -33358,5 +33456,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33712,4 +33810,18 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Valittu polku ei sisällä valittua pistettä."
+#~ msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Asteina, minuutteina ja sekunteina"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)"
+
 #~ msgid "Unknown version"
 #~ msgstr "Tuntematon versio"
@@ -33776,7 +33888,4 @@
 #~ msgid "Unknown file extension."
 #~ msgstr "Tuntematon tiedostopääte."
-
-#~ msgid "Do not show again"
-#~ msgstr "Älä näytä uudelleen"
 
 #~ msgid "Error parsing server response."
@@ -34081,7 +34190,4 @@
 #~ msgstr[1] ""
 #~ "Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?"
-
-#~ msgid "Boat"
-#~ msgstr "Vene"
 
 #~ msgid "Motorboat"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 22568)
+++ applications/editors/josm/i18n/po/fr.po	(revision 22569)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-24 21:35+0000\n"
-"Last-Translator: Vincent Calame <vincent.calame@exemole.fr>\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-08-03 22:07+0000\n"
+"Last-Translator: François Blondel <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-07-28 09:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -22,5 +22,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -51,14 +51,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -75,9 +74,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -232,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -246,5 +245,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -264,11 +263,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -276,20 +276,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -323,5 +323,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Fusionner"
@@ -391,5 +391,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -403,5 +403,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -423,4 +423,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -437,6 +438,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -448,5 +449,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -581,22 +582,22 @@
 msgstr "Téléchargement des groupes de modifications ouverts..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Fusionner les chemins"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Fusionner plusieurs chemins en un seul"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Inverser les sens ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Inverser et fusionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -606,5 +607,5 @@
 "sens. Voulez-vous en inverser certains ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -614,10 +615,10 @@
 "une seule chaîne de nœuds)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Fusionner {0} chemins"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Veuillez sélectionner au moins deux chemins à fusionner."
@@ -664,10 +665,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -806,5 +807,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -870,10 +871,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Exporter en GPX…"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Exporter les données vers un fichier GPX"
@@ -1068,5 +1069,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1511,20 +1512,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1548,5 +1549,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1557,6 +1558,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Erreur"
@@ -1583,5 +1584,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1589,5 +1590,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Sauvegarder les données"
@@ -1644,10 +1645,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Enregistrer sous…"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Sauvegarder les données dans un nouveau fichier"
@@ -1694,5 +1695,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1719,5 +1720,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Non, annuler"
@@ -1786,18 +1787,24 @@
 msgstr[1] "Simplifier le chemin (supprimer {0} nœuds)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Couper le chemin"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Couper le chemin au nœud sélectionné"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "La sélection ne peut pas être utilisée pour couper."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Les nœuds sélectionnés ne partagent pas le même chemin."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1805,5 +1812,5 @@
 msgstr[1] "Les nœuds sélectionnés ne sont pas au milieu d’un chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1819,21 +1826,11 @@
 "sélectionner le chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Les nœuds sélectionnés ne partagent pas le même chemin."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Le chemin sélectionné ne contient pas le nœud sélectionné."
-msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "Vous devez sélectionner deux nœuds ou plus pour couper un chemin fermé."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1843,5 +1840,5 @@
 "sélectionnez des nœuds au milieu du chemin.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1852,5 +1849,5 @@
 "nécessaire.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1860,5 +1857,5 @@
 "chemins.<br>Vous devriez vérifier et corriger si nécessaire.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2008,5 +2005,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2706,5 +2703,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
-msgstr "<b>sens unique ?</b> - oneway=yes, true, 1 ou on"
+msgstr "<b>oneway?</b> - oneway=yes, true, 1 ou on"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
@@ -2724,10 +2721,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid "<b>user:</b>... - all objects changed by user"
-msgstr "<b>utilisateur :</b>... - tous les objets modifiés par l’utilisateur"
+msgstr "<b>user:</b>... - tous les objets modifiés par l’utilisateur"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
-"<b>utilisateur:anonyme</b> - tous les objets changés par des utilistateurs "
+"<b>user:anonymous</b> - tous les objets changés par des utilistateurs "
 "anonymes"
 
@@ -2735,6 +2732,5 @@
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
-"<b>identifiant :</b>… - objet avec l’identifiant indiqué (0 pour les "
-"nouveaux objets)"
+"<b>id:</b>… - objet avec l’identifiant indiqué (0 pour les nouveaux objets)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
@@ -2743,5 +2739,5 @@
 "assigned version)"
 msgstr ""
-"<b>version :</b>... - objet avec la version donnée (0 objets n’ayant pas de "
+"<b>version:</b>... - objet avec la version donnée (0 objets n’ayant pas de "
 "version attribuée)"
 
@@ -2751,6 +2747,6 @@
 "assigned changeset)"
 msgstr ""
-"<b>groupe de modifications :</b>... - objet avec l’identifiant du groupe de "
-"modifications donné (0 objets sans groupe de modifications attribué)"
+"<b>changeset:</b>... - objet avec l’identifiant du groupe de modifications "
+"donné (0 objets sans groupe de modifications attribué)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
@@ -2759,6 +2755,6 @@
 "min-max)"
 msgstr ""
-"<b>nœuds :</b>... - objet avec un nombre donné de nœuds (nœuds : nombre ou "
-"nœuds : min-max)"
+"<b>nodes:</b>... - objet avec un nombre donné de nœuds (nodes:total ou nodes:"
+"min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
@@ -2767,6 +2763,6 @@
 "max)"
 msgstr ""
-"<b>attributs :</b>... - objet avec un nombre donné d’attributs (attributs : "
-"nombre ou attributs : min-max)"
+"<b>tags:</b>... - objet avec un nombre donné d’attributs (tags:total ou tags:"
+"min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
@@ -2779,5 +2775,5 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 msgstr ""
-"<b>horodatage :</b>... - objets possédant ce tampon horodateur (<b>2009-11-"
+"<b>timestamp:</b>... - objets possédant ce tampon horodateur (<b>2009-11-"
 "12T14:51:09Z</b>, <b>2009-11-12</b> ou <b>T14:51</b> ...)"
 
@@ -3059,22 +3055,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3221,6 +3217,6 @@
 msgstr "impossible de résoudre un conflit non arbitré"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
@@ -3228,20 +3224,20 @@
 "vide"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Supprimer le nœud {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Supprimer le chemin {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Supprimer la relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3250,5 +3246,5 @@
 msgstr[1] "Supprimer {0} objets"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3257,5 +3253,5 @@
 msgstr[1] "Supprimer {0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3264,5 +3260,5 @@
 msgstr[1] "Supprimer {0} chemins"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3271,5 +3267,5 @@
 msgstr[1] "Supprimer {0} relations"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3427,5 +3423,5 @@
 msgstr "Appliquer ?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3493,4 +3489,5 @@
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
+"Incapable de créer le dossier {0}, la sauvgarde automatique sera désactivée"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
@@ -3498,19 +3495,20 @@
 msgid "Unable to create file {0}, other filename will be used"
 msgstr ""
+"Incapable de créer le fichier {0}, un autre nom de fichier va être utilisé"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Ignorer les vieilles sauvegardes ?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Erreur lors de la création du dossier de cache : {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3711,42 +3709,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Degrés Minutes Secondes"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Coordonnées projetées"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "O"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3756,5 +3757,5 @@
 "inclue"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3939,5 +3940,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "arrière-plan"
@@ -4085,5 +4086,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Ne plus afficher (choix mémorisé)"
@@ -4111,5 +4112,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "voie ferrée"
@@ -4131,6 +4132,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4199,5 +4200,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "bâtiment"
@@ -4284,5 +4285,5 @@
 msgstr "Objet supprimé"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4387,29 +4388,29 @@
 msgstr "Mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "Options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Montrer cette aide"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Argument de géométrie standard UNIX"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Télécharger la zone délimitée"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Télécharger le lieu se rapportant à l’URL (avec lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4417,9 +4418,9 @@
 "Fichier/Ouvrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Télécharger la zone délimitée en données GPS brutes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4427,34 +4428,34 @@
 "lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Sélectionner avec la recherche actuelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Lancer maximisé"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Rétablir les préférences par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Définissez la langue"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 "options disponibles en tant que fichiers de propriétés système pour Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CHEMIN/VERS/REPERTOIRE/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Changer le répertoire pour tous les paramètres utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4467,9 +4468,9 @@
 "     pour spécifier la taille maximale de mémoire allouée en mégaoctets"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "exemples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4479,46 +4480,45 @@
 "cet ordre."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Assurez-vous de charger des données si vous utilisez --sélection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialisation"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Mise à jour des greffons..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Installation des greffons mis à jour"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Chargement des premiers greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Régalage des valeurs par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Création de l’interface graphique"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Chargement des greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Résoudre"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr "Restaurer"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4527,5 +4527,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4621,33 +4621,33 @@
 msgstr "Zoom arrière"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "échelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Longitude géographique au niveau du pointeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Nom de l’objet au niveau du pointeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Latitude géographique au niveau du pointeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Angle entre le segment de chemin précédent et l’actuel"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Orientation du segment de chemin."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Longueur du segment de chemin"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4657,9 +4657,9 @@
 "CTRL pour sélectionner depuis cette liste.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(aucun objet)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4675,4 +4675,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Le calque \"{0}\" doit se trouver dans la liste des calques"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Numérique"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "chinoise"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Zone de bureaux"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5431,5 +5446,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "all"
@@ -5513,6 +5528,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5523,5 +5538,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5673,5 +5688,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Groupes de modifications"
@@ -5735,5 +5750,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5901,5 +5916,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5907,5 +5922,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5913,5 +5928,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5919,5 +5934,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5925,5 +5940,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5932,5 +5947,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5938,5 +5953,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5944,5 +5959,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5950,24 +5965,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtre actif</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objets cachés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objets désactivés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6049,51 +6064,51 @@
 msgstr "Fermer la fenêtre sans créer de nouveau nœud"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Calques"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Ouvrir la liste des calques chargés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Supprimer le calque."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Afficher/Masquer le calque."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Afficher/Masquer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Afficher/Masquer le calque."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Activer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Activer le calque"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Fusionner ce calque dans une autre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Dupliquer ce calque"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Déplacer le calque vers le haut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Déplacer le calque vers le bas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Informations à propos du calque."
@@ -6103,5 +6118,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relations"
@@ -7271,6 +7286,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7318,107 +7334,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Nom"
@@ -7805,5 +7821,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7895,5 +7911,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<différent>"
@@ -8669,5 +8685,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Limites"
@@ -8740,8 +8756,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Type"
@@ -8770,6 +8786,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "inconnue"
@@ -9132,5 +9148,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Conflits détectés"
@@ -9202,14 +9218,15 @@
 "Attention : l’entête d’erreur \"{0}\" ne correspond à aucun motif attendu."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Ajoutez un commentaire sur les modifications que vous envoyez :"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Entrer un commentaire d’envoi (min. 3 caractères)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Commentaire de l’envoi erroné"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "Identifiant du groupe de modifications :"
@@ -9705,5 +9722,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Envoyer"
@@ -9725,5 +9742,5 @@
 msgstr "Initialisation des relations à mettre à jour..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9731,15 +9748,15 @@
 msgstr "Paramètres"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 "Décider comment envoyer les données et quel groupe de modifications utiliser"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Attributs du nouveau groupe de modifications"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
@@ -9747,5 +9764,5 @@
 "seront envoyées"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
@@ -9753,45 +9770,77 @@
 "envoyer"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Configurer les réglages avancés"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Envoi vers ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Envoyer les modifications"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Envoyer les primitives modifiées"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-"Veuillez entrer un commentaire sur ce groupe de modifications (minimum 3 "
-"caractères)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Commentaire de l’envoi erroné"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Inverser"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Continuer"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Annuler et revenir à l’éditeur"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Ne plus voir ce message"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Veuillez d’abord entrer une taille de bloc valide"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Taille de bloc erronée"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Annuler l’envoi et reprendre la modification"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -10163,109 +10212,11 @@
 msgstr[1] "{0} objets à supprimer :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "point GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Personnaliser le dessin des lignes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Utiliser les réglages généraux."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Dessiner des lignes entre les points pour ce calque."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Sélectionner les options de dessin des lignes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Personnaliser la couleur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Par défaut"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Choisir une couleur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Marqueurs depuis des points nommés"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Points de parcours nommés depuis {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Importer Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>Les données dans le calque GPX ''{0}'' ont été téléchargées depuis le "
-"serveur.<br>Impossible de les corréler avec des données audio car leurs "
-"points ne sont pas horodatés.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Import impossible"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Fichiers audio Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marqueurs audio de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importer des images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html>Les données dans le calque GPX ''{0}'' ont été téléchargées depuis le "
-"serveur.<br>Impossible de les corréler avec des images car leurs points ne "
-"sont pas horodatés.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10273,5 +10224,5 @@
 msgstr "Nom : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10279,5 +10230,5 @@
 msgstr "Description : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10287,23 +10238,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Durée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Longueur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Longueur : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10312,5 +10263,5 @@
 msgstr[1] "{0} itinéraires, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10319,10 +10270,10 @@
 msgstr[1] "{0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convertir en calque de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10332,21 +10283,21 @@
 "comme nuisible.<br>Si vous voulez envoyer des traces, regardez ici :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Converti depuis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10354,10 +10305,10 @@
 msgstr "Télécharger depuis OSM le long de ce chemin"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Tout télécharger dans un rayon de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10365,10 +10316,10 @@
 msgstr "{0} mètres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Aire maximale par requête:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10376,21 +10327,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr "Télécharger à proximité de:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr "chemin uniquement"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr "points de passage uniquement"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr "chemin et points de passage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10402,5 +10353,5 @@
 "Voulez-vous<br>continuer ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -10408,5 +10359,5 @@
 "audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10416,5 +10367,5 @@
 "fin de la trace ont été ignorés ou déplacés au début."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10424,19 +10375,117 @@
 "leur horodatage ont été ignorés."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Personnaliser le dessin des lignes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Utiliser les réglages généraux."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Dessiner des lignes entre les points pour ce calque."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Sélectionner les options de dessin des lignes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Personnaliser la couleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Par défaut"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Choisir une couleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Marqueurs depuis des points nommés"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Points de parcours nommés depuis {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Importer Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>Les données dans le calque GPX ''{0}'' ont été téléchargées depuis le "
+"serveur.<br>Impossible de les corréler avec des données audio car leurs "
+"points ne sont pas horodatés.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Import impossible"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Fichiers audio Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marqueurs audio de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importer des images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>Les données dans le calque GPX ''{0}'' ont été téléchargées depuis le "
+"serveur.<br>Impossible de les corréler avec des images car leurs points ne "
+"sont pas horodatés.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Calque de données {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "en dehors de la zone téléchargée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
@@ -10444,5 +10493,5 @@
 "0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10451,11 +10500,11 @@
 msgstr[1] "Il y avait {0} conflits détectés."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Fermer la fenêtre et continuer les modifications"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10464,36 +10513,36 @@
 msgstr[1] "{0} supprimés"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} est consistué de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "vide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "Version de l’API : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Convertir en calque GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Test de cohérence de l’ensemble de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "Pas de problème trouvé."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Les problèmes suivants ont été trouvés:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10503,5 +10552,5 @@
 "comme nuisible.<br>Si vous voulez envoyer des traces, regardez ici :</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10510,5 +10559,5 @@
 msgstr[1] "traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10516,5 +10565,5 @@
 msgstr[1] "points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10523,5 +10572,5 @@
 msgstr[1] "une trace avec {0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10530,5 +10579,5 @@
 msgstr[1] "{0} est constitué de {1} traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10537,24 +10586,28 @@
 msgstr[1] "{0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Corréler en GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Fichiers GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Le fichier {0} est maintenant chargé sous le nom \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Erreur d’analyse du traitement {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Impossible de lire \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10566,34 +10619,34 @@
 "la photo et sélectionnez un fuseau horaire.<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Heure de la photo (information EXIF) :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Heure du GPS (lu sur la photo) : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [jj/mm/aaa hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Je suis dans le fuseau horaire de : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Aucune date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Ouvrez une autre photo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchroniser l’heure avec une photo du GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10603,21 +10656,21 @@
 "Merci d’utiliser le format demandé"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Date non valide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Aucune trace GPX chargée>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "Trace GPX : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Ouvrir une autre trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10626,72 +10679,72 @@
 "GPS</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Estimation automatique"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr "Fait correspondre la première photo avec le premier point gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Ajustement manuel"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "Ignorer la position pour : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Images avec géolocalisation dans les métadonnées EXIF ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Images qui sont déjà taguées ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Afficher les vignettes sur la carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Fuseau horaire : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Décallage :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Corréler les images avec la trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Corréler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Fuseau horaire invalide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Décallage invalide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Essayez encore"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "Aucune image ne correspond !"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "Aucun GPX sélectionné"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10704,20 +10757,20 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Fuseau horaire : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Secondes : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10726,5 +10779,5 @@
 msgstr[1] "(Différence de {0} jours)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10735,22 +10788,22 @@
 "manuellement."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "La correspondance des photos avec la trace a échoué"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Ajuster le fuseau horaire et le décalage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 "Les photos sélectionnées ne contiennent pas d’information d’horodatage."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Les photos ne contienne tpas d’information d’horodatage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10760,17 +10813,17 @@
 "autre."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "La trace GPX n’a pas d’horodatage."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Vous devez sélectionner une trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Aucune trace GPX sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10781,5 +10834,5 @@
 "Format attendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10790,56 +10843,52 @@
 "Format attendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extraction des positions GPS depuis les informations EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Début de l’analyse du dossier"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "Un des fichiers sélectionnés était vide."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Lire des photos…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lecture de {0}…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Impossible d’obtenir le chemin canonical du dossier {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Analyse du dossier {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fichier vide trouvé dans le dossier {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Images géolocalisées"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Corréler en GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10848,5 +10897,5 @@
 msgstr[1] "{0} images chargées."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10855,10 +10904,10 @@
 msgstr[1] "{0} ont un attribut GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Supprimer le fichier de l'image du disque"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10869,5 +10918,5 @@
 "perdu !</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "Le fichier de l'image n'a pas pu être supprimé."
@@ -10969,9 +11018,9 @@
 msgstr "images JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "marqueur gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10979,5 +11028,5 @@
 msgstr[1] "marqueurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10986,9 +11035,23 @@
 msgstr[1] "{0} est constitué de {1} marqueurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"Il n’existe pas de marqueurs audio dans ce calque pour y appliquer un "
+"décalage ."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "Afficher Texte/Icônes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Afficher/Masquer le texte des marqueurs et les icônes."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Synchronizer l’audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10997,5 +11060,5 @@
 "de synchronisation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -11003,14 +11066,14 @@
 msgstr "Fichier audio synchronisé au point {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Impossible de synchroniser dans le calque actuellement joué."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Créer un marqueur audio au niveau de la tête de lecture"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -11019,18 +11082,4 @@
 "Vous devez mettre le fichier audio en pause au point de la trace où vous "
 "voulez le marqueur."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"Il n’existe pas de marqueurs audio dans ce calque pour y appliquer un "
-"décalage ."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr "Afficher Texte/Icônes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Afficher/Masquer le texte des marqueurs et les icônes."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11998,4 +12047,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Aucun"
@@ -12010,5 +12060,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "Dessiner un cercle d’après les valeurs HDOP."
@@ -12112,5 +12162,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Seulement pour les directions intéressantes (sens unique par exemple)"
@@ -12118,5 +12168,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Seulement à l’extrémité du chemin."
@@ -12146,5 +12196,20 @@
 msgstr "Créer des marqueurs à la lecture du GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Auteur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Gazole"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Bateaux"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12154,9 +12219,9 @@
 "l’ouverture d’un calque GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Dessiner des lignes entre les points GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12166,9 +12231,9 @@
 "Entrez ''-1'' pour tracer toutes les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Longueur maximale des fichiers locaux (mètres)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12177,10 +12242,10 @@
 "toutes les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Longueur maximale (mètres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12189,5 +12254,5 @@
 "d’information sur les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
@@ -12195,5 +12260,5 @@
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12202,5 +12267,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12210,13 +12275,13 @@
 "valeur l’une de l’autre."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Distance minimale (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Afficher de plus gros points GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12226,9 +12291,9 @@
 "dans le Gestionnaire de calques"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Colorie les segments et les points en fonction de la vitesse."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12238,37 +12303,46 @@
 "précision (HDOP). Votre instrument doit enregistrer cette information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Permet de colorier la trace en fonction de la vitesse."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Colorier les traces et les points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "Description du point"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "Points GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Dessiner les flèches de direction pour les sections de chemin."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Afficher l’ordre de tous les segments des chemins."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Appliquer un anticrénelage aux contours de la carte."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Afficher les limites des données téléchargées depuis le serveur."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12277,9 +12351,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Afficher les calques de données inactifs sous une autre couleur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Données OSM"
@@ -12661,21 +12735,26 @@
 msgstr "Vous devez redémarrer JOSM pour que les réglages prennent effet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Méthode de projection"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Code de la projection"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Afficher les coordonnées en"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Méthode de projection"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Code de la projection"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Calque où faire des mesures"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Projection de la carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -13269,5 +13348,5 @@
 msgstr "Ajouter un nouvel attribut"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -13278,49 +13357,49 @@
 "display_values doit être le même que dans les valeurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Plus d’infos sur cette caractéristique"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Prérequis inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "Rôles disponibles"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr "rôle"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr "nombre"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr "éléments"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Attributs optionnels :"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Type inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr "Élément de rôle prédéfini sans parent"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr "Sous élément prédéfini sans parent"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13330,15 +13409,15 @@
 msgstr "Impossible de lire la source des balises : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erreur d’analyse de {0} : "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Les éléments de type {0} sont supportés."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13348,17 +13427,17 @@
 msgstr[1] "Modifier {0} objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Rien n’est sélectionné !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Sélection inappropriée !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Appliquer le pré-réglage"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13376,26 +13455,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Rechercher : "
+msgstr "Recherche préreglée"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Show preset search dialog"
-msgstr ""
+msgstr "Voir la boîte de dialogue de recherche préreglée"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Rechercher les objets"
+msgstr "Préreglages de recherche"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Afficher le nom traduit dans les listes de sélection"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Rechercher : "
+msgstr "Recherche dans les mots-clés"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13730,5 +13805,5 @@
 msgstr "Échec de l’analyse du fichier \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -15394,5 +15469,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15696,5 +15771,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Interpolation d’adresse"
@@ -16103,41 +16178,41 @@
 msgstr "Ne plus voir ce message"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "Adresse des bâtiments"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "Numéro de la maison :"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Nom de la rue :"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Incrément"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Décrement"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Numéros :"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr "Mode de grand bâtiments"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr "Paramètres avancés"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr "Attribut de bâtiment :"
@@ -16154,25 +16229,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Définir la grandeur des bâtiments"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "Utiliser la fenêtre d’adresse"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr "Sélectionner automatiquement le bâtiment"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Largeur des bâtiments :"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr "Longueur de l’escalier :"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr "Avancé..."
@@ -16210,18 +16285,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Bâtiments"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr "Num. suivant"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Rue"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr "Saisissez les adresses"
@@ -16400,7 +16475,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
-#, fuzzy
 msgid "Use \"Tableau d''assemblage\""
-msgstr "Sélectionner le tableau d'assemblage"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -16466,8 +16540,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "eau"
@@ -16528,6 +16602,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "adresse"
@@ -17038,34 +17112,34 @@
 "Sélectionnez-en un dans la liste, puis réessayez"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Calque vide"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Calque WMS ({0}), {1} tuile(s) chargée(s)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "N’est pas vectorisée."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Taille de l’image matricielle : {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "Est vectorisée."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Zone délimitée de la commune : {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -17077,9 +17151,9 @@
 "Veuillez en créer un nouveau."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Erreur de format du cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -17088,5 +17162,5 @@
 "actuelle"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 msgid "Cache Lambert Zone Error"
 msgstr "Erreur de cache pour la zone Lambert"
@@ -17166,23 +17240,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Télécharger un objet..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
 msgstr ""
-"Télécharger les données cartographiques sur la fin de la voie sélectionnée"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Télécharger maintenant"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Veuillez sélectionner au moins une tâche à télécharger"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -17192,12 +17261,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Test {0}/{1} : {2}"
+msgstr "entre {0} {1} et {2} {3}"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Erreur lors de l’analyse syntaxique de {0} : {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -17228,9 +17297,9 @@
 msgstr "Créer un chemin dupliqué"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Calque pour modifier les traces GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convertir en calque GPX en rendant anonyme l’horodatage"
@@ -17240,5 +17309,5 @@
 msgstr "EditGPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "Modifier les traces GPX"
@@ -17247,11 +17316,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Importer un chemin depuis le calque GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Abandonner le chemin"
@@ -17261,5 +17330,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Aucun calque GPX trouvé."
@@ -17269,13 +17338,13 @@
 msgstr "Le script enfant a retourné des données invalides."
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr "Outil d'édition"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -17521,5 +17590,5 @@
 msgstr "Afficher des photos non géolocalisées"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Images importées"
@@ -17883,8 +17952,6 @@
 msgstr "Ouvrir la fenêtre de mesure."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Rétablir"
@@ -17915,5 +17982,5 @@
 msgstr "Angle entre deux nœuds sélectionnés"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Calque où faire des mesures"
@@ -18010,5 +18077,5 @@
 msgstr "Boucle de téléchargement OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Afficher les problèmes d’OpenStreetBugs"
@@ -18083,13 +18150,13 @@
 msgstr "Mettre en file d’attente"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "déconnecté"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "connecté"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -18207,13 +18274,17 @@
 msgstr "Exécutable Firefox"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "Lire l’erreur !"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "Écrire l’erreur !"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "Écrire les coordonnées dans l’entête de l’image"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
@@ -18221,51 +18292,51 @@
 "suivants :"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "préférences"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "garder une saubeagarde des fichiers"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "changer la date de modification du fichier :"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "à la date GPS"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "à la précédente valeur (mtime inchangé)"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr "Greffon Photo Geotagging"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "Écriture de l’information sur la position dans les fichiers images..."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "Imposible de lire mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "Impossible d’écrire mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "Le fichier ne peut être supprimé !"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "Ne peut pas renommer le fichier !"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
@@ -18273,32 +18344,28 @@
 "h3>"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "Ignorer les vieilles sauvegardes ?"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "Garder les vieilles sauvegardes et continuer"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "Ignorer"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "Ne peut pas supprimer le fichier temporaire !"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "Le test a échoué : impossible de lire mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "Le test a échoué : impossible d’écrire mtime."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "Écrire les coordonnées dans l’entête de l’image"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -18339,9 +18406,9 @@
 msgstr "Nouveau calque image depuis le fichier..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "L’image n’a pas été créée correctement."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "Impossible de trouver l’objet de la carte."
@@ -18519,20 +18586,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "version choisie :"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "Confirmez toutes les actions de Remote Control manuellement"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Permet un contrôle de JOSM par d’autres applications."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Paramètres du greffon Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18544,34 +18616,36 @@
 "communiquant avec le greffon."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Actions permises"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Il a été demandé à Remote Control de charger les données depuis l’API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Voulez-vous permettre cela ?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Confirmer l’action de Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr "Il a été demandé à Remote Control de créer un nouveau nœud."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -18579,17 +18653,23 @@
 "suivante :"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr "Annuler la liste des changements dans son ensemble"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr "Annuler seulement la sélection"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr "Annuler la sélection et restaurer les objets supprimés"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -18597,5 +18677,5 @@
 msgstr "Réversion du groupe de changement"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Rétablir"
@@ -18795,41 +18875,41 @@
 msgstr "Supprime les nœuds inutiles d'une zone."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Carte glissante"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Zoom automatique"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Charger la tuile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "Monter les informations sur la tuile."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Charger toutes les tuiles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Augmenter le zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Diminuer le zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "Revenir à la taille de la tuile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Réinitialiser la mémoire tampon des tuiles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "image "
@@ -19137,4 +19217,14 @@
 msgid "Terrace"
 msgstr "Bâtiments mitoyens"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Séparateur"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19904,6 +19994,6 @@
 msgstr "Ajouter l’attribut manquant {0}={1}"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19913,9 +20003,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr "Séparer maintenant"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr "Séparer les chemins"
@@ -19999,6 +20089,6 @@
 msgstr "{0}  trouvé"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -20006,5 +20096,5 @@
 msgstr "Erreurs de validation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Aucune erreur de validation"
@@ -20249,32 +20339,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Fusionner les nœuds dupliqués ?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Nœuds dupliqués"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Nœuds dupliqués"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Fusionner les nœuds dupliqués ?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Nœuds dupliqués"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Fusionner les nœuds dupliqués ?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -20313,5 +20397,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipolygone"
@@ -20846,5 +20930,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "zone"
@@ -20981,10 +21065,10 @@
 msgstr "{0}…"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr "Affiche la position actuelle dans la vidéo"
@@ -21134,10 +21218,10 @@
 "Impossible de lire l’information depuis walking-papers.org pour l’id \"{0}\""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers : {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -21344,9 +21428,5 @@
 "Cela peut amener à de mauvaises coordonnées."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Téléchargement automatique"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21355,19 +21435,19 @@
 "« {0} »"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(désactivé)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, 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:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -21381,17 +21461,17 @@
 "vos<br>préférences.<br>Voulez-vous récupérer des tuiles WMS ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Oui, récupérer les images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "URL invalide ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Télécharger les tuiles visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21399,33 +21479,33 @@
 "La zone demandée est trop grande. Prière de changer le zoom ou la résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Sauvegarder un calque WMS dans un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Sauvegarder le calque WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Charger un calque WMS depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Charger le calque WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -21434,15 +21514,19 @@
 "{1} attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Erreur lors du chargement du fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Placer un marque-page WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Téléchargement automatique"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -21521,5 +21605,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -21556,5 +21640,5 @@
 msgstr "Disposotof audio non disponible"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -21577,5 +21661,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "forêt"
@@ -21588,78 +21672,67 @@
 #. relation type
 #: build/specialmessages.java:17
-#, fuzzy
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr "Créer une relation associatedStreet"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "frontière"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Incrément"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "à haute tension"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Multipolygone"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Réseau"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "transport public"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Restriction"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "itinéraire"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Site"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "voie fluviale"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -21943,7 +22016,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Télécharger depuis OSM le long de ce chemin"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -22173,6 +22245,11 @@
 msgstr "Créer des maisons mitoyennes depuis des blocs entiers."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22181,5 +22258,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22190,5 +22267,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22199,10 +22276,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 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:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22213,5 +22290,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22221,5 +22298,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22230,15 +22307,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Facilite le téléchargement le long de plusieurs chemins interconnectés"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 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:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22248,5 +22325,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22380,5 +22457,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Référence"
@@ -22917,5 +22994,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "métal"
@@ -22928,5 +23005,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "bois"
@@ -23230,9 +23307,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "oui"
@@ -23342,9 +23419,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "non"
@@ -23603,5 +23680,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "rue résidentiel"
@@ -23650,5 +23727,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "voie d’accès"
@@ -23683,5 +23760,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "construction"
@@ -23768,5 +23845,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "randonnée"
@@ -23801,5 +23878,5 @@
 msgstr "bon"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "rouge"
@@ -23969,14 +24046,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Compagnie"
@@ -24244,6 +24321,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Altitude"
@@ -24691,5 +24768,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marais"
@@ -25095,5 +25172,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Tension"
@@ -25457,31 +25534,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Horaires d’ouverture"
@@ -25541,90 +25618,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24h/24 7j/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lun-Ven 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Mar-Dim 08:00-15:00 ; Sam 08:00-12:00"
@@ -25737,7 +25814,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Numéro de référence"
@@ -25753,5 +25830,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "souterraine"
@@ -25764,6 +25841,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Payant"
@@ -25939,5 +26016,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Fauteuils roulants"
@@ -25974,6 +26051,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Abri"
@@ -25981,5 +26058,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Banc"
@@ -26098,5 +26175,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Balise lumineuse"
@@ -26257,5 +26334,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -26263,73 +26340,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italienne"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "chinoise"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "grecque"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "allemande"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indienne"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "régionale"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turque"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asiatique"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thaïlandaise"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexicaine"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japonaise"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "française"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Fast-Food"
@@ -26337,17 +26419,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifier un fast-food"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "poisson et frites"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "poulet"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Café"
@@ -26355,9 +26437,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Modifier un café"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub (anglo-saxon)"
@@ -26365,18 +26447,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Modifier un pub (anglo-saxon)"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Modifier un biergarten"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar"
@@ -26384,9 +26467,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Modifier un bar"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Boîte de nuit"
@@ -26394,24 +26477,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Modifier une boîte de nuit"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Tourisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Modifier une attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Musée"
@@ -26419,9 +26502,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Modifier un musée"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -26430,9 +26513,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Modifier un zoo"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Point de vue"
@@ -26440,24 +26523,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Modifier un point de vue"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Tour de surveillance"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Parc d’attraction"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Modifier un parc d’attraction"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Œuvre d'art"
@@ -26465,5 +26548,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Modifier une œuvre d’art"
@@ -26471,19 +26554,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Office du Tourisme"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Carte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Niveau de détail"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "carte topographique"
@@ -26521,5 +26604,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26527,28 +26610,28 @@
 msgstr "rue"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "carte schématique"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Zone affichée"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "Site"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "Ville"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "Région"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Description"
@@ -26558,5 +26641,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Affichage des itinéraires de :"
@@ -26564,5 +26647,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Randonnée"
@@ -26570,6 +26653,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Cyclisme"
@@ -26577,5 +26660,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "VTT"
@@ -26583,6 +26666,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Ski"
@@ -26590,5 +26673,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Équitation"
@@ -26596,46 +26679,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "…autres modes de transport possibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Panneau d’informations"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Contenu du panneau"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "annonce"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "histoire"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "faune"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "flore"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Poteau indicateur"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "pylône"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Terminal d’informations"
@@ -26643,29 +26734,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Description"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Guide audio"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Guide audio par téléphone portable ?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Point d’information"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Modifier un abri"
@@ -26673,25 +26764,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
-msgstr "Cheminée"
+msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Site de pique-nique"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Modifier un site de pique-nique"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Patrimoine"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Château"
@@ -26700,19 +26791,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Modifier un château"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruines"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Modifier des ruines"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Site archéologique"
@@ -26721,9 +26812,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Modifier un site archéologique"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Lieu de bataille"
@@ -26731,10 +26822,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Modifier un lieu de bataille"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Site paléontologique"
@@ -26742,5 +26833,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Modifier un site paléontologique"
@@ -26748,15 +26839,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Modifier un monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Mémorial"
@@ -26764,55 +26855,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Modifier un mémorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Croix"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Modifier une croix"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Chapelle"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Modifier une chapelle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Modifier une pierre frontalière"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Loisir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Parc aquatique"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Modifier un parc aquatique"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Terrain de jeux pour enfants"
@@ -26820,35 +26911,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Modifier un terrain de jeux pour enfants"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Pêche"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Modifier un lieu de pêche"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Terrains de sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stade"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Modifier un stade"
@@ -26862,6 +26953,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "Selectionnez un sport :"
@@ -27277,31 +27368,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "terrain de sport"
@@ -27311,240 +27402,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "multisport"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "tir à l’arc"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "athlétisme"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
-msgstr ""
-
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+msgstr "football americain"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "football australien"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "boulingrin"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
-msgstr ""
-
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+msgstr "football canadien"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "canoë"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "escalade"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "filets de cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "cyclisme"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "course de chiens"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "équitation"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
-msgstr ""
-
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+msgstr "football gaélique"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gymnastique"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "course de chevaux"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "moteur"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelote"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "sport de raquettes"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
-msgstr ""
-
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+msgstr "ligue de rugby"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
-msgstr ""
-
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+msgstr "union de rugby"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "chasse"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "roller"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "football"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "natation"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "tennis de table"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Centre sportif"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Modifier un centre sportif"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Terrain de sport"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Modifier un terrain de sport"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Circuit"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Modifier un circuit"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Modifier un terrain de golf"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Modifier un minigolf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Sports"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Multisport"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Modifier un terrain multisport"
@@ -27586,23 +27677,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "type"
@@ -27644,211 +27735,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "terrain"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "centre de sports"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "piste"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Modifier un bowling"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Athlétisme"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Modifier l’athlétisme"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Tir à l’arc"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Modifier le tir à l’arc"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Escalade"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Modifier l'escalade"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Canoë"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Modifier le canoë"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Modifier le cyclisme"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Course de chiens"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Modifier une course de chiens"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Équitation"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Modifier un sport équestre"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Course de chevaux"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Modifier une course de chevaux"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gymnastique"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Modifier la gymnastique"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Sport mécanique"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Modifier un sport mécanique"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Roller"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Modifier le roller"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Modifier le skateboard"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Natation"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Modifier la natation"
@@ -27856,52 +27947,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Type de ski"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "alpin"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "nordique"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "snowpark"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Difficulté"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "verte"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "bleue"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "noire"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "orange"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "jaune"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Tir sportif"
@@ -27909,204 +28000,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Modifier le tir sportif"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Sports de balle"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Modifier le football"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Football australien"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Modifier le football australien"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Modifier le baseball"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Modifier le basketball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Modifier un parcours de golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Jeu de boules"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Modifier le jeu de boules"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Boulingrin"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Modifier le boulingrin"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Modifier le cricket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Filets de cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Modifier des filets de cricket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Modifier le croquet"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Modifier le hockey"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelote"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Modifier la pelote basque"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Sport de raquette"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Modifier un sport de raquette"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Tennis de table"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Modifier le tennis de table"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Modifier le tennis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Artificiel"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Bâtiment"
@@ -28114,5 +28205,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Bâtiment public"
@@ -28120,10 +28211,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Modifier un bâtiment public"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Mairie"
@@ -28131,10 +28222,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Modifier une mairie"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Ambassade"
@@ -28142,10 +28233,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Modifier une ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Palais de justice"
@@ -28154,10 +28245,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Modifier un palais de justice"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Prison"
@@ -28166,10 +28257,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Modifier une prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Commissariat de police"
@@ -28179,10 +28270,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Modifier un commissariat de police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Caserne de pompiers"
@@ -28191,10 +28282,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Modifier une caserne de pompiers"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Bureau de poste"
@@ -28202,5 +28293,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Modifier un bureau de poste"
@@ -28208,15 +28299,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Modifier un jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "École"
@@ -28224,10 +28315,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Modifier une école"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Université"
@@ -28235,10 +28326,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Modifier une université"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Établissement d’enseignement supérieur"
@@ -28246,5 +28337,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Modifier un établissement d’enseignement supérieur"
@@ -28252,5 +28343,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Cinéma"
@@ -28259,10 +28350,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Modifier un cinéma"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Bibliothèque"
@@ -28271,9 +28362,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Modifier une bibliothèque"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Centre artistique"
@@ -28281,10 +28372,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Modifier un centre artistique"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Théâtre"
@@ -28293,10 +28384,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Modifier un théatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Lieu de culte"
@@ -28306,5 +28397,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Modifier un lieu de culte"
@@ -28313,6 +28404,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religion"
@@ -28321,66 +28412,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahaïsme"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "bouddhisme"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "christianisme"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hindouisme"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jaïnisme"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "judaïsme"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikhisme"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "spiritualisme"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoïsme"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "unitarisme"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastrisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Dénomination"
@@ -28389,81 +28480,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglicanisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "catholicisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "évangélisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "témoins de Jehovah"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "luthérianisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "méthodisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormonisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "orthodoxie"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pentecôtisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbytérianisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestantisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "chiisme"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunnisme"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Adresses"
@@ -28472,5 +28563,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Modifier l’adresse"
@@ -28478,5 +28569,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Numéro du bâtiment"
@@ -28484,25 +28575,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Nom de la maison"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Nom de la rue"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Nom de la ville"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Code postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Indicatif du pays"
@@ -28511,5 +28602,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Modifier une interpolation d’adresse"
@@ -28517,61 +28608,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Numérotation"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "pair"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "impair"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alphabétique"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Édifices"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Usine"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Modifier une usine"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Structure de grande hauteur"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Modifier une structure de grande hauteur"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Type de structure"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Hauteur (mètres)"
@@ -28579,25 +28670,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Château d’eau"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Modifier un château d’eau"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gazomètre"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Modifier un gazomètre"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Phare"
@@ -28605,10 +28696,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Modifier un phare"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Moulin à vent"
@@ -28616,10 +28707,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Modifier un moulin à vent"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Canalisation"
@@ -28629,41 +28720,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Modifier une canalisation"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "turbine à gaz"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "chaleur"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "pétrole"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "égouts"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "toute substance"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Commune"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "sous-marine"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "aérienne"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Station d’épuration"
@@ -28673,10 +28764,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Modifier une station d’épuration"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Grue"
@@ -28684,5 +28775,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Modifier une grue"
@@ -28690,10 +28781,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Modifier une balise lumineuse"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Équipement de topographie"
@@ -28701,10 +28792,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Modifier un équipement de topographie"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -28712,23 +28803,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Modifier une caméra de surveillance"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "intérieur"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "extérieur"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Centrale électrique"
@@ -28738,35 +28829,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Modifier une centrale électrique"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "éolienne"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "hydroélectrique"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fossile"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "nucléaire"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "charbon"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "solaire photovoltaïque"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Station électrique"
@@ -28775,10 +28866,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Modifier une station électrique"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Transformateur électrique"
@@ -28787,5 +28878,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Modifier un transformateur électrique"
@@ -28793,10 +28884,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Référence de la ligne"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Pylône électrique"
@@ -28807,23 +28898,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Modifier un pylône électrique"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "pylônes"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "pylône"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Référence du pylône"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Ligne électrique"
@@ -28832,78 +28923,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Modifier une ligne électrique"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Type de ligne"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "à haute tension"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "à basse tension"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Nombre de câbles"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Nombre de conducteurs par câbles"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "simple"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "quadruple"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Équipements"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Toilettes publiques"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "limité"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Paiement"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Boîte aux lettres"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Cabine téléphonique"
@@ -28912,5 +29001,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Modifier une cabine téléphonique"
@@ -28918,5 +29007,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Pièces"
@@ -28924,5 +29013,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Billets"
@@ -28930,5 +29019,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Porte-monnaie électronique"
@@ -28936,5 +29025,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Cartes de débit"
@@ -28942,15 +29031,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Cartes de crédit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Cartes téléphoniques"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Point de recyclage"
@@ -28959,5 +29048,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Modifier un point de recyclage"
@@ -28965,35 +29054,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Canettes"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Vêtements"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Verre"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Ferraille"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Poubelle"
@@ -29001,5 +29090,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Modifier une poubelle"
@@ -29008,31 +29097,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Dossier"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Matériau"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "pierre"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plastique"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Couleur"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "noir"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "marron"
@@ -29111,39 +29200,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "vert"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "rouge"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "bleu"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "blanc"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Nombre de places"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
@@ -29152,30 +29241,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "moyenne"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "grande"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Camouflé"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Verrouillé"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Fontaine"
@@ -29184,10 +29273,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Modifier une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Point d’eau potable"
@@ -29196,10 +29285,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Modifier un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -29208,11 +29297,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
-msgstr "Modifier un hydrant"
+msgstr "Modifier une borne incendie"
 
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Tour d’abandon"
@@ -29220,15 +29309,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Modifier une tour d’abandon"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Commerce"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Concessionnaire automobile"
@@ -29236,10 +29325,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Modifier une concession"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Magasin de vélos"
@@ -29248,28 +29337,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Modifier un magasin de vélo"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Modifier un supermarché"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Droguerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Modifier une droguerie"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Épicerie"
@@ -29277,9 +29366,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Modifier une épicerie"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosque à journaux"
@@ -29287,27 +29376,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Modifier un kiosque à journaux"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Librairie"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Modifier une librairie"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Agence de voyage"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Modifier une agence de voyage"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Boucherie"
@@ -29315,9 +29404,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Modifier une boucherie"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Boulangerie"
@@ -29325,9 +29414,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Modifier une boulangerie"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Fleuriste"
@@ -29335,18 +29424,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Modifier un fleuriste"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Magasin bio"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Modifier un magasin bio"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Alcool"
@@ -29354,54 +29443,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Modifier un magasin d’alcool"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Boissons"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Modifier un magasin de boissons"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Informatique"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Modifier un magasin d’informatique"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Électronique"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Modifier un magasin d’électronique"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Modifier un magasin Hi-Fi"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Ameublement"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Modifier un magasin d’ameublement"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Jardinerie"
@@ -29409,9 +29498,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Modifier une jardinerie"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Quincaillerie"
@@ -29419,9 +29508,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Modifier une quincaillerie"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Bricolage"
@@ -29429,54 +29518,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Modifier un magasin de bricolage"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Papeterie"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Modifier une papeterie"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Salon de coiffure"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Modifier un salon de coiffure"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Chaussures"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Modifier un magasin de chaussures"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Jouets"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Modifier un magasin de jouets"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Vidéoclub"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Modifier un vidéoclub"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Pressing"
@@ -29484,9 +29573,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Modifier un pressing"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Laverie"
@@ -29494,9 +29583,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Modifier une laverie"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Sports en plein air"
@@ -29504,24 +29593,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Modifier un magasin de sports en plein air"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Modifier un magasin de sport"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Opticien"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Modifier un opticien"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Distributeur automatique"
@@ -29529,5 +29618,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Modifier un distributeur automatique"
@@ -29535,97 +29624,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Produits vendus"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "tickets de transport public"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "plans de transport public"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "tickets de parking"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "nourriture"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "boissons"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "bonbons"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "alimentation animale"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "journaux"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "jouets"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "timbres"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "cartes SIM"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "bons téléphoniques"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr "Tunnel cyclable"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "préservatifs"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "sacs pour excrément"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Cartes de fidélité"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Argent"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Banque"
@@ -29633,14 +29722,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Modifier une banque"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Distributeur automatique"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Bureau de change"
@@ -29648,5 +29737,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Modifier un bureau de change"
@@ -29654,15 +29743,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Modifier un distributeur automatique"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Santé"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Cabinet médical"
@@ -29670,18 +29759,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Modifier un cabinet médical"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Cabinet dentaire"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Modifier un cabinet dentaire"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Pharmacie"
@@ -29689,5 +29778,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Modifier une pharmacie"
@@ -29695,9 +29784,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Dispensaire"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Hôpital"
@@ -29705,10 +29794,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Modifier un hôpital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -29717,5 +29806,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Modifier un point d’accès d’urgence"
@@ -29724,20 +29813,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Nom du point"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utiliser le code international, comme +12-345-67890)"
@@ -29745,5 +29834,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Cabinet vétérinaire"
@@ -29752,64 +29841,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Modifier un cabinet vétérinaire"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Géographie"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Lieux"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Modifier un continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Pays"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Modifier un pays"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Département"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Modifier un département"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Région"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Modifier une région"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Comté/Canton"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Modifier un comté/canton"
@@ -29817,15 +29906,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Modifier une ville"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Ville de 10 000 à 100 000 habitants"
@@ -29833,10 +29922,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Modifier une ville"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Banlieue"
@@ -29844,25 +29933,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Modifier une banlieue"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Modifier un village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Hameau"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Modifier un hameau"
@@ -29870,5 +29959,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Lieu-dit"
@@ -29876,10 +29965,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Modifier un lieu-dit"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "île"
@@ -29887,10 +29976,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Modifier une île"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "îlot"
@@ -29898,5 +29987,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Modifier un îlot"
@@ -29904,5 +29993,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Entrée de grotte"
@@ -29910,10 +29999,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Modifier une entrée de grotte"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Sommet"
@@ -29921,10 +30010,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Modifier un sommet"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Glacier"
@@ -29932,10 +30021,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Modifier un glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Volcan"
@@ -29943,70 +30032,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Modifier un volcan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Frontières"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Nationale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Modifier une frontière nationale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Modifier une frontière administrative"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Modifier une frontière civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Électorale"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Modifier une zone électorale"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Parc national"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Modifier une frontière d’un parc national"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Arbre"
@@ -30015,15 +30104,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Modifier un arbre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Nom botanique"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Bois"
@@ -30032,5 +30121,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Modifier un bois"
@@ -30038,17 +30127,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "conifères"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "feuillus"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "conifères et feuillus"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Forêt"
@@ -30057,14 +30146,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Modifier une  forêt"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Réserve naturelle"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Modifier une réserve naturelle"
@@ -30072,25 +30161,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Zone d’éboulements"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Modifier une zone d’éboulements"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Broussailles"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Modifier des broussailles"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Talus"
@@ -30098,10 +30187,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Modifier un talus"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Lande"
@@ -30109,5 +30198,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Modifier une lande"
@@ -30115,5 +30204,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Cour de ferme"
@@ -30122,45 +30211,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Modifier une cour de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Terre arable"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Modifier une terre arable"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Modifier une prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Modifier une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Modifier des jardins familiaux"
@@ -30168,25 +30257,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Jardin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Modifier un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Herbe"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Modifier une zone herborée"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Village green (anglo-saxon)"
@@ -30194,10 +30283,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Modifier un village green (anglo-saxon)"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Espace publique"
@@ -30205,20 +30294,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Modifier un espace publique"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Parc"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Modifier un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -30226,5 +30315,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifier une aire de jeux"
@@ -30232,15 +30321,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Modifier une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -30248,9 +30337,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Modifier un petit cimetière"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -30258,39 +30347,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Modifier un cimetière"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Zone de commerces"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Modifier une zone de commerces"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Zone de bureaux"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Modifier une zone de bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Modifier une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -30298,15 +30387,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Modifier une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Terrain militaire"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Modifier un terrain militaire"
@@ -30314,50 +30403,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Chantier"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Modifier un chantier"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Terrain vague"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Modifier un terrain vague"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Zone d’aménagement"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Modifier une zone d’aménagement"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Modifier une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Modifier une carrière"
@@ -30367,5 +30456,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Modifier un multipolygone"
@@ -30377,5 +30466,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "segment extérieur"
@@ -30383,5 +30472,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -30389,5 +30478,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -30398,5 +30487,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -30404,42 +30493,42 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
-msgstr ""
-
-#: build/trans_presets.java:3230
+msgstr "civile"
+
+#: build/trans_presets.java:3236
 msgid "political"
-msgstr ""
-
-#: build/trans_presets.java:3231
+msgstr "politique"
+
+#: build/trans_presets.java:3237
 msgid "Administrative level"
-msgstr ""
+msgstr "Niveau administrative"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
-msgstr ""
+msgstr "Centre d'administration"
 
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -30448,5 +30537,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Modifier une interdiction de tourner"
@@ -30454,34 +30543,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "Interdiction d’aller tout droit"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "Obligation d’aller tout droit"
@@ -30490,15 +30579,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "chemin d’origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "nœud ou chemin \"via\""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "au chemin"
@@ -30506,5 +30595,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Itinéraire"
@@ -30513,5 +30602,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Modifier un itinéraire"
@@ -30519,5 +30608,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Type d’itinéraire"
@@ -30625,5 +30714,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30634,17 +30723,17 @@
 msgstr "vélo"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "ski"
@@ -30712,5 +30801,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30720,9 +30809,9 @@
 msgstr "chemin pour piétons"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "détour"
@@ -30736,10 +30825,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Symbole"
@@ -30747,31 +30836,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Réseau"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "État de l’itinéraire"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Couleur (hexadécimale)"
@@ -30780,30 +30869,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "segment d’itinéraire"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "point d’arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "point d’arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "point d’arrêt précédent"
@@ -31030,5 +31119,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "déprécié"
@@ -31681,4 +31770,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -31782,11 +31879,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "artificiel"
@@ -32299,5 +32396,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "jetée/ponton"
@@ -32311,5 +32408,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "canalisation"
@@ -32453,13 +32550,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "loisir"
@@ -32473,5 +32570,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "port"
@@ -32567,10 +32664,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "équipement"
@@ -32672,10 +32769,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "équipement de circulation"
@@ -33113,24 +33210,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "balise lumineuse"
@@ -33162,6 +33259,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "fontaine/eau potable"
@@ -33222,8 +33319,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "santé"
@@ -33576,26 +33673,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "magasin"
@@ -33667,8 +33764,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hôtel"
@@ -33769,9 +33866,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "tourisme"
@@ -33859,9 +33956,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "patrimoine"
@@ -33874,5 +33971,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "carrière"
@@ -33886,5 +33983,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "décharge"
@@ -33906,5 +34003,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "bassin"
@@ -33918,5 +34015,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "cour de ferme"
@@ -33939,5 +34036,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "commerce"
@@ -33951,5 +34048,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "zone industrielle"
@@ -33963,5 +34060,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "terrain vague"
@@ -33975,5 +34072,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "zone d’aménagement"
@@ -33987,5 +34084,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "zone ferroviaire"
@@ -34042,7 +34139,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "terrain militaire"
@@ -34056,5 +34153,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "cimetière"
@@ -34067,5 +34164,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "sommet"
@@ -34080,5 +34177,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "glacier"
@@ -34092,5 +34189,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "volcan"
@@ -34145,8 +34242,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "nature"
@@ -34160,5 +34257,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "broussailles"
@@ -34172,5 +34269,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "lande"
@@ -34184,5 +34281,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "Zone forestière"
@@ -34196,5 +34293,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "terrain boueux"
@@ -34208,5 +34305,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "plage"
@@ -34284,8 +34381,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "itinéraire"
@@ -34374,12 +34471,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "frontière"
@@ -34529,11 +34626,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "lieu"
@@ -34547,5 +34644,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "données TIGER"
@@ -34901,9 +34998,20 @@
 msgstr "Sicile - Italie"
 
-#~ msgid "closedway"
-#~ msgstr "chemin fermé"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "La cible de type {0} avec un id {1} est une version invalide"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Le chemin sélectionné ne contient pas le nœud sélectionné."
+#~ msgstr[1] ""
+#~ "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Degrés Minutes Secondes"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Entrer un commentaire d’envoi (min. 3 caractères)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Veuillez entrer un commentaire sur ce groupe de modifications (minimum 3 "
+#~ "caractères)"
 
 #~ msgid "Move"
@@ -34973,7 +35081,4 @@
 #~ msgid "their version:"
 #~ msgstr "version du serveur :"
-
-#~ msgid "resolved version:"
-#~ msgstr "version choisie :"
 
 #~ msgid "Contacting the OSM server..."
@@ -35086,7 +35191,4 @@
 #~ msgid "Motorboat"
 #~ msgstr "Bateaux à moteur"
-
-#~ msgid "Boat"
-#~ msgstr "Bateaux"
 
 #~ msgid "Cycleway"
@@ -36662,4 +36764,7 @@
 #~ "{0} objets<br>du jeu de données car ils étaient supprimés sur le serveur."
 
+#~ msgid "closedway"
+#~ msgstr "chemin fermé"
+
 #~ msgid "More than one \"via\" found."
 #~ msgstr "Plus d’un chemin \"via\" trouvé."
@@ -36770,2 +36875,5 @@
 #~ msgid "Errors during Download"
 #~ msgstr "Erreurs lors du téléchargement"
+
+#~ msgid "Target of type {0} with id {1} has invalid version"
+#~ msgstr "La cible de type {0} avec un id {1} est une version invalide"
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 22568)
+++ applications/editors/josm/i18n/po/gl.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-27 21:16+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 13:21+0000\n"
 "Last-Translator: Dario <dario.villar.v@gmail.com>\n"
 "Language-Team: Galician <gl@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-07-28 09:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -232,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -246,5 +245,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -264,11 +263,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -276,20 +276,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -322,5 +322,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Fundir"
@@ -389,5 +389,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -401,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -421,4 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -435,6 +436,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -446,5 +447,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -579,22 +580,22 @@
 msgstr "Descargando conxunto de cambios abiertos..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Combinar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Combinar varias vías en unha."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Cambiar direccións?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Invertir e Combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -604,5 +605,5 @@
 "invertir algunhas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -612,10 +613,10 @@
 "serie de nodos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona polo menos dúas vías para combinar."
@@ -662,10 +663,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -805,5 +806,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -869,10 +870,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Exportar a GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Exportar os datos a un ficheiro GPX."
@@ -1065,5 +1066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1508,20 +1509,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1545,5 +1546,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1554,6 +1555,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Erro"
@@ -1580,5 +1581,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1586,5 +1587,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Gardar os datos actuais."
@@ -1641,10 +1642,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Gardar como..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Gardar os datos actuais nun novo ficheiro."
@@ -1691,5 +1692,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1716,5 +1717,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Non, abortar"
@@ -1784,18 +1785,24 @@
 msgstr[1] "Simplificar via ( borrar {0} nodos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Separar Vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Separar unha vía no nodo seleccionado."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "A selección actual non pode ser usada para a separación."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Os nodos seleccionados non comparten a mesma vía."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1803,5 +1810,5 @@
 msgstr[1] "Os nodos seleccionados non están no medio de ningunha vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1817,20 +1824,10 @@
 "selecciona tamén a vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Os nodos seleccionados non comparten a mesma vía."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "A via seleccionada non contén o nodo seleccionado."
-msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Debes escoller dous ou máis nodos para separar unha vía circular."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1840,5 +1837,5 @@
 "nodos no medio da vía.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1848,5 +1845,5 @@
 "rutas.<br>Debería verificar esto e corrixilo cando sexa necesario.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1856,5 +1853,5 @@
 "verificar esto e corrixilo cando sexa necesario.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2006,5 +2003,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3029,22 +3026,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3191,26 +3188,26 @@
 msgstr "Non se pode resolver conflictos indecisos."
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 "Polo menos requirese un obxecto para borrar, conseguiuse unha colección vacia"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Borrar nodo {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Borrar via {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Borrar relación{0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3219,5 +3216,5 @@
 msgstr[1] "Borrados {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3226,5 +3223,5 @@
 msgstr[1] "Borrados {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3233,5 +3230,5 @@
 msgstr[1] "Borradas {0} vias"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3240,5 +3237,5 @@
 msgstr[1] "Borradas {0} relacións"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3393,5 +3390,5 @@
 msgstr "Aplicar?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3466,17 +3463,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Erro obtendo ficheiros do directorio {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Sobreescribir os arquivos de respaldo antigos?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Erro creando directorio caché: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3673,42 +3670,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Grados Minutos Segundos"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Coordenadas Proxectadas"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "O"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3718,5 +3718,5 @@
 "incluido"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3897,5 +3897,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "fondo"
@@ -4043,5 +4043,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Non mostrar esto outra vez(recordar escolla)"
@@ -4069,5 +4069,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "Vía férrea"
@@ -4089,6 +4089,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4157,5 +4157,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "construcción"
@@ -4242,5 +4242,5 @@
 msgstr "Obxecto borrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4341,29 +4341,29 @@
 msgstr "Contrasinal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opcións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Amosar esta axuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Argumento de xeometría unix estandar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Descargar a caixa de límites"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Descargar a ubicación da url (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4371,41 +4371,41 @@
 "Abrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Descargar a caixa de límites como datos gps en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Descargar localozación na url (con lat=x&lon=y&zoom=z) como gps en crú"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Escoller coa busca indicada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Lanzar en modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Restablecer as preferencias ós valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Establecer a linguaxe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "opción dadas polas propiedades do sistema de Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/RUTA/Á/CARPETA/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Cambiar o directorio para as configuración de todos os usuarios"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4419,9 +4419,9 @@
 "en megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4431,46 +4431,45 @@
 "orde."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Asegurate de que cargas algún dato se usas --selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inicializando"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Actualizando  Plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Instalando plugins actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Cargando extensións anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Establecendo valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Creando Interface (GUI) principal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Cargando extensións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Resolver"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4479,5 +4478,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4573,33 +4572,33 @@
 msgstr "Reducir Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "escalar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "A lonxitude xeográfica na posición do punteiro do rato."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "O nome do obxecto na posición do punteiro do rato."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "A latitude xeográfica na posición do punteiro do rato."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "O ángulo entre o segmento previo e o actual da vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "A dirección (da brúxula) do segmento de liña que se está a debuxar."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "A lonxitude do novo segmento de vía que se está a debuxar."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4609,9 +4608,9 @@
 "CTRL para escoller directamente desta lista co rato.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(sen obxecto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4627,4 +4626,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "A capa \"{0}\" debe estar na lista de capas"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Servizo"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "chino"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Comercial"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5384,5 +5398,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "todo"
@@ -5466,6 +5480,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5476,5 +5490,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5626,5 +5640,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Conxunto de cambios"
@@ -5690,5 +5704,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5857,5 +5871,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5863,5 +5877,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5869,5 +5883,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5875,5 +5889,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5881,5 +5895,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5888,5 +5902,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5894,5 +5908,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5900,5 +5914,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5906,24 +5920,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro Activo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b>obxectos agochados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> obxectos deshabilitados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6005,51 +6019,51 @@
 msgstr "Pecha o diálogo,non crear un novo nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Abrir unha lista de todas as capas cargadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Borrar as capas escollidas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Cambiar o estado visible da capa seleccionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Amosar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Cambiar o estado visible da capa seleccionada."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Activar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Activar a capa escollida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Mistura esta capa con outra"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Duplicar esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Mover a capa seleccionada unha fila cara arriba."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Mover a capa seleccionada unha fila cara abaixo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Información da capa"
@@ -6059,5 +6073,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relacións"
@@ -7223,6 +7237,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7270,107 +7285,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Nome"
@@ -7736,5 +7751,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7821,5 +7836,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<diferente>"
@@ -8553,5 +8568,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8624,8 +8639,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr ""
@@ -8654,6 +8669,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "descoñecido"
@@ -8991,5 +9006,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Detectaronse conflictos"
@@ -9053,14 +9068,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Proporciona un breve comentario para os cambios que vas a subir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Introduce o teu comentario"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "id de conxunto de cambios:"
@@ -9491,5 +9507,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9511,5 +9527,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9517,60 +9533,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Subir Cambios"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Invertir"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Continuar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Non amosar de novo"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9890,103 +9938,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "punto gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Personalizar debuxo de liñas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Usar configuración global."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Debuxar liñas entre puntos para esta capa."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Non debuxar liñas entre puntos para esta capa."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Escoller as opcións de liña do debuxo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Personalizar Cor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predeterminado"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Escolle unha cor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Marca dos puntos con nome"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Puntos de trazado con nome de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Importar Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Ficheiros Wave Audio (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcas de audio de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importar imaxes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9994,5 +9950,5 @@
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10000,5 +9956,5 @@
 msgstr "Descrición: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10008,23 +9964,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Lonxitude: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10033,5 +9989,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10040,10 +9996,10 @@
 msgstr[1] "{0} puntos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10053,21 +10009,21 @@
 "perxudicial.<br>Se desexas subir trazados, mira aqui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10075,10 +10031,10 @@
 msgstr "Descargar de OSM ó longo desta pista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Descargar todo o que abarca:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10086,10 +10042,10 @@
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10097,21 +10053,21 @@
 msgstr "{0} km cad."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10123,9 +10079,9 @@
 "Desexas<br>continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10135,5 +10091,5 @@
 "posteriores ó fin foron omitidos ou movidos ó inicio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10143,23 +10099,115 @@
 "correctamente os seus tempos foron omitidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Personalizar debuxo de liñas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Usar configuración global."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Debuxar liñas entre puntos para esta capa."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Non debuxar liñas entre puntos para esta capa."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Escoller as opcións de liña do debuxo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Personalizar Cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Escolle unha cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Marca dos puntos con nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Puntos de trazado con nome de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Importar Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Ficheiros Wave Audio (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcas de audio de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importar imaxes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "fora da área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10168,11 +10216,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10181,36 +10229,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} composto de:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Convertir a capa GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10218,5 +10266,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10225,5 +10273,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10231,5 +10279,5 @@
 msgstr[1] "puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10238,5 +10286,5 @@
 msgstr[1] "un trazado con {0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10245,5 +10293,5 @@
 msgstr[1] "{0} componse de {1} trazados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10252,24 +10300,28 @@
 msgstr[1] "{0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Ficheiros GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "O ficheiro {0} cárgase baixo o nome \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Erro durante a análise {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Non se puido ler \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10278,34 +10330,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10313,93 +10365,93 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10409,20 +10461,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10431,5 +10483,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10437,21 +10489,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10459,17 +10511,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10478,5 +10530,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10485,56 +10537,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Ler fotos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Atopouse un ficheiro nulo no directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Erro obtendo ficheiros do directorio {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imaxes xeo-etiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10543,5 +10591,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10550,10 +10598,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10562,5 +10610,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10660,9 +10708,9 @@
 msgstr "imaxes JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "marca gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10670,5 +10718,5 @@
 msgstr[1] "marcas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10677,9 +10725,22 @@
 msgstr[1] "{0} componse de {1} marcas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"Non existen marcas de audio en esta capa para, a partir das cales, compensar."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Cambiar o estado visible do texto e iconas da marca."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Sincronizar Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10687,5 +10748,5 @@
 "Debes pausar o audio no momento que escoites a túa entrada de sincronización."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10693,31 +10754,18 @@
 msgstr "Audio sincronizado no punto {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Non se pode sincronizar nunha capa en reproducción."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr "Debes ter pausado o audio no punto da pista onde queres a marca."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"Non existen marcas de audio en esta capa para, a partir das cales, compensar."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Cambiar o estado visible do texto e iconas da marca."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11576,4 +11624,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Ningún"
@@ -11588,5 +11637,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11689,5 +11738,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11697,5 +11746,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Só no extremo da vía."
@@ -11725,5 +11774,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Autor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Diesel"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "norte"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11733,9 +11797,9 @@
 "se abra unha capa GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Debuxar liñas entre puntos GPS en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11745,9 +11809,9 @@
 "todas as liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Lonxitude máxima para os arquivos locais (metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11756,10 +11820,10 @@
 "todas as liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Lonxitude máxima (metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11768,10 +11832,10 @@
 "de liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Debuxar frechas de dirección para as liñas, conectando puntos GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11780,5 +11844,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11788,13 +11852,13 @@
 "da anterior."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima (pixeles)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Debuxar puntos máis grandes para os puntos GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11804,9 +11868,9 @@
 "personalizados no Xestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Cores, puntos e segmentos de trazado en función da velocidade."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11814,28 +11878,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Permite afinar o coloreado de trazados para diferentes velocidades medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Coloreado de Trazados e Puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Debuxar consellos de dirección para segmentos de vía."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Debuxar os números de orde de todos os segmentos dentro da súa liña."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -11844,10 +11916,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Debuxar os límites dos datos cargados dende o servidor."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11856,9 +11928,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Debuxar as capas de datos inactivas nunha cor diferente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Datos OSM"
@@ -12216,21 +12288,25 @@
 msgstr "Debes reiniciar JOSM para que algúns parámetros se fagan efectivos."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Método de proxección"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Amosar coordenadas como"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Método de proxección"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+msgid "System of measurement"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Proxección do mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12774,5 +12850,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12781,49 +12857,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Máis información acerca desta característica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Atributos Opcionais:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo descoñecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12833,15 +12909,15 @@
 msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Os elementos do tipo {0} están soportados."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12851,17 +12927,17 @@
 msgstr[1] "Cambiar {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Selección non axeitada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Aplicar axuste preestablecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12879,7 +12955,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Buscar obxectos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12888,17 +12963,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Buscar obxectos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Facer zoom sobre a selección"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Buscar obxectos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13197,5 +13269,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Erro de análise: estrutura de documento non válida para documento gpx"
@@ -14704,5 +14776,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14973,5 +15045,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr ""
@@ -15314,41 +15386,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "Numero de casa:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Nome da Calle:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Incremento"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Decremento"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Números:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15365,25 +15437,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Establecer tamaño dos edificios"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Ancho de edificios:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15421,18 +15493,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Construccións"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15664,8 +15736,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "auga"
@@ -15726,6 +15798,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "enderezo"
@@ -16197,34 +16269,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16235,14 +16307,14 @@
 "Crear unha nova."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -16319,22 +16391,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Descargar obxeto..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Descargar todos os membros das relacións escollidas"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Descargar agora"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Por favor, selecciona polo menos unha tarefa para descargar"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16349,7 +16417,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Estilo de pintura {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16380,9 +16448,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -16392,5 +16460,5 @@
 msgstr "EditarGpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "editar grabacións gpx"
@@ -16399,11 +16467,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Importar ruta da capa GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Borrar ruta existente"
@@ -16413,5 +16481,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Non se atopou capa de datos GPX"
@@ -16421,13 +16489,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16670,5 +16738,5 @@
 msgstr ""
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Imaxes Importadas"
@@ -17017,8 +17085,6 @@
 msgstr ""
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Restablecer"
@@ -17049,5 +17115,5 @@
 msgstr "Angulo entre dous nodos escollidos"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr ""
@@ -17139,5 +17205,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -17203,13 +17269,13 @@
 msgstr "Cola"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "desconectado"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "en liña"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17321,94 +17387,94 @@
 msgstr "Executable de firefox"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "Erro de lectura!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "Erro de Escritura!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "Escribir coordenadas á cabeceira da imaxe"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "configuración"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "manter arquivos de respaldo"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "cambiar a data de modificación do arquivo:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "á data do gps"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "ao valor anterior"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "Escribindo información sobre a posición aos arquivos de imaxe..."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "O arquivo non puido ser borrado!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "Non se puido renomear o arquivo!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "Sobreescribir os arquivos de respaldo antigos?"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "Gardar os antigos arquivos de respaldo e continuar"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "Sobrepor"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "Non se puido borrar o arquivo temporal!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "Escribir coordenadas á cabeceira da imaxe"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -17449,9 +17515,9 @@
 msgstr "Nova capa de imaxe de arquivo..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "Imaxe non creada apropiadamente."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "Non se puido atopar o obxecto mapa."
@@ -17629,21 +17695,26 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "versión final:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 "Un engadido que permirte que JOSM sexa controlado por outras aplicacións"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Configuración do engadido Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17652,50 +17723,58 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Accións permitidas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Require detalles: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Desexa permitir esto?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Confirma a acción do Control Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17703,5 +17782,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Revertir"
@@ -17900,41 +17979,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -18234,4 +18313,14 @@
 msgid "Terrace"
 msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Separador"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18935,6 +19024,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18944,9 +19033,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -19025,6 +19114,6 @@
 msgstr "Atopado {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19032,5 +19121,5 @@
 msgstr "Erros de validación"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Sen erros de validación"
@@ -19271,32 +19360,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Borrando nodos duplicados..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Borrando nodos duplicados..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Borrando nodos duplicados..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Borrando nodos duplicados..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Borrando nodos duplicados..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Borrando nodos duplicados..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19333,5 +19416,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr ""
@@ -19851,5 +19934,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr ""
@@ -19985,10 +20068,10 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -20134,10 +20217,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20323,28 +20406,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20355,64 +20434,68 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Gardar capa WMS nun ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS dende ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Erro de Formato de Ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Erro cargando ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
 msgstr ""
 
@@ -20492,5 +20575,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20525,5 +20608,5 @@
 msgstr "Dispositivo de audio non dispoñible"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20544,5 +20627,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "plantación forestal"
@@ -20561,71 +20644,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "fronteira"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Incremento"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "liña"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Crear multipoligono"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Rede"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "transporte público"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Restricción"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "ruta"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "lugar"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "Vía acuática"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20900,7 +20973,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Descargar de OSM ó longo desta pista"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -21131,6 +21203,11 @@
 msgstr "Crea edificion entre medianeras a partires de bloques únicos"
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21141,5 +21218,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21150,5 +21227,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21159,10 +21236,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 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:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21173,5 +21250,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21181,5 +21258,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21190,5 +21267,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -21196,10 +21273,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 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:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21210,5 +21287,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21343,5 +21420,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Referencia"
@@ -21880,5 +21957,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "metal"
@@ -21891,5 +21968,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "bosque"
@@ -22193,9 +22270,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "si"
@@ -22305,9 +22382,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "non"
@@ -22566,5 +22643,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "rúa urbana"
@@ -22613,5 +22690,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "vía de servicio"
@@ -22646,5 +22723,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "en construcción"
@@ -22731,5 +22808,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "senda"
@@ -22764,5 +22841,5 @@
 msgstr "bon"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "intermedia"
@@ -22932,14 +23009,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operador/a"
@@ -23207,6 +23284,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Elevación"
@@ -23654,5 +23731,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marísma"
@@ -24058,5 +24135,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Voltaxe"
@@ -24420,31 +24497,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -24504,90 +24581,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Vie 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
@@ -24700,7 +24777,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Número de referencia"
@@ -24716,5 +24793,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "subterráneo"
@@ -24727,6 +24804,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "De pago"
@@ -24902,5 +24979,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Cadeira de rodas"
@@ -24937,6 +25014,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Refuxio"
@@ -24944,5 +25021,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Banco"
@@ -25061,5 +25138,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Baliza"
@@ -25220,5 +25297,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Cociña"
@@ -25226,73 +25303,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "grego"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "rexional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "xaponés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "francés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Comida rápida"
@@ -25300,17 +25382,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecemento de comida rápida"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "fish_and_chips (patacas e pescado fritos)"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "polo"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Cafetería"
@@ -25318,9 +25400,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub"
@@ -25328,18 +25410,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Editar pub"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar"
@@ -25347,9 +25430,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Club nocturno"
@@ -25357,24 +25440,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Editar club nocturno"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Editar atracción"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museo"
@@ -25382,9 +25465,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Editar museo"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -25393,9 +25476,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Editar zoo"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -25403,24 +25486,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Torre de vixía"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Parque temático"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Editar parque temático"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Gráficos"
@@ -25428,5 +25511,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Editar traballo artístico"
@@ -25434,19 +25517,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Oficina de información"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Grado de detalle"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "topográfico"
@@ -25484,5 +25567,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25490,28 +25573,28 @@
 msgstr "rúa"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Mostrar área"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "lugar"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "cidade"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "rexión"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Descripción detallada"
@@ -25521,5 +25604,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Rutas mostradas para:"
@@ -25527,5 +25610,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Sendeiro"
@@ -25533,6 +25616,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -25540,5 +25623,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Bicicleta de montaña"
@@ -25546,6 +25629,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Esquí"
@@ -25553,5 +25636,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Equitación"
@@ -25559,46 +25642,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "...outro métodos de desprazamentos posibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Tablón de anuncios"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "aviso"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "historial"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "natureza"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "vida salvaxe"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "plantas"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Poste identificador"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "poste"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Punto de información"
@@ -25606,29 +25697,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Descripción detallada"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Audioguía"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "¿Audioguía a través de teléfono móvil?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Número de teléfono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Outros Puntos de Información"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Editar refuxio"
@@ -25636,25 +25727,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Cheminea"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Zona de picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Castelo"
@@ -25663,19 +25754,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Editar castelo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruínas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Editar ruínas"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Lugar arqueolóxico"
@@ -25684,9 +25775,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueolóxico"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -25694,10 +25785,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Editar campo de batalla"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Sitio paleontolóxico"
@@ -25705,5 +25796,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Editar sitio paleontolóxico"
@@ -25711,15 +25802,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -25727,55 +25818,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Cruceiro"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Editar cruceiro"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Camiño a santuario"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Editar camiño a santuario"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Perdra Histórica"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Editar Pedra histórica"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Zona de xogos"
@@ -25783,35 +25874,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Editar zona de xogos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Editar pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Deportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -25825,6 +25916,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "escoller deporte:"
@@ -26240,31 +26331,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "deporte"
@@ -26274,240 +26365,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr "fútbol_americano"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr "fútbol_canadiense"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "carreira de cans"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr "fútbol_gaélico"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "ximnasia"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "carreira de cabalos"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr "liga_rugby"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr "rugby_union"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "patinaxe"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Cancha de xogo"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Editar cancha de xogo"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Pista de carreiras"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreiras"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Deportes"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Múltiple"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -26549,23 +26640,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "tipo"
@@ -26607,211 +26698,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "cancha de xogo"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Carreiras de cans"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Editar carreiras de cans"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Carreira de cabalos"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Editar carreiras de caballos"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Ximnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Editar Ximnasia"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Patinaxe"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Editar patinaxe"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Natación"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -26819,52 +26910,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Dificultade"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "fora da pista"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Tiro"
@@ -26872,204 +26963,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr "Futbol Americano"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr "Editar Fútbol Americano"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr "Fútbol_Canadiense"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr "Editar Fútbol Canadiense"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr "Fútbol Gaélico"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr "Editar Fútbol Gaélico"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr "Liga de Rugby"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr "Rugby Union"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr "Editar Rugby Union"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Críket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Edit críket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Críket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Editar críket con redes"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Ténis de mesa"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Editar tenis de mesa"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Artificial"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Edificio"
@@ -27077,5 +27168,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Edificio público"
@@ -27083,10 +27174,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Casa do Concello"
@@ -27094,10 +27185,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Editar Casa do Concello"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Embaixada"
@@ -27105,10 +27196,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Xuzgado"
@@ -27117,10 +27208,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Editar xuzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Prisión"
@@ -27129,10 +27220,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Policía"
@@ -27142,10 +27233,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Parque de bombeiros"
@@ -27154,10 +27245,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Editar parque de bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -27165,5 +27256,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -27171,15 +27262,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Xardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Editar Xardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Escola"
@@ -27187,10 +27278,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Editar escola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Universidade"
@@ -27198,10 +27289,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Editar universidade"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Instituto"
@@ -27209,5 +27300,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Editar instituto"
@@ -27215,5 +27306,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Cine"
@@ -27222,10 +27313,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Biblioteca"
@@ -27234,9 +27325,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -27244,10 +27335,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Teatro"
@@ -27256,10 +27347,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -27269,5 +27360,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -27276,6 +27367,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Relixión"
@@ -27284,66 +27375,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "cristian"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "xudía"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "musulmá"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Denominación"
@@ -27352,81 +27443,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evanxélico"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "testigos de Xenoveva"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Enderezos"
@@ -27435,5 +27526,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Editar enderezos"
@@ -27441,5 +27532,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Número de casa"
@@ -27447,25 +27538,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Nome da casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Nome da rúa"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Nome da cidade"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Código do país"
@@ -27474,5 +27565,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Editar interpolación de direccións"
@@ -27480,61 +27571,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Feito polo home"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "comunicación"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "observación"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Altura (en metros)"
@@ -27542,25 +27633,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Torre de auga"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Faro"
@@ -27568,10 +27659,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Muíño de vento"
@@ -27579,10 +27670,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Editar muíño de vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Tubería"
@@ -27591,41 +27682,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "térmico"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "aceite"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "augas residuais"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "calquer substancia"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Localización"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "sumerxido"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "na superficie"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -27635,10 +27726,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Grúa"
@@ -27646,5 +27737,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Editar grúa"
@@ -27652,10 +27743,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Vértice xeodésico"
@@ -27663,10 +27754,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Editar vértice xeodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Cámara de vixilancia"
@@ -27674,23 +27765,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vixilancia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "interiores"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "exteriores"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "público"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Xerador de enerxía"
@@ -27700,35 +27791,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Editar Xerador de Enerxía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "vento"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -27737,10 +27828,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -27749,5 +27840,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -27755,10 +27846,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Liña de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Torre de electricidade"
@@ -27769,23 +27860,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidade"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "poste"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Referencia da torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -27794,78 +27885,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Tipo de liña"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "liña"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "baixa tensión"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Cantidade de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de arames (mellor:conductores) por cable de tensión"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "sinxelo"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "dobre"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "cuadruple"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Servizos"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Baños"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Buzón de Correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Teléfono"
@@ -27874,5 +27963,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -27880,5 +27969,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Moedas"
@@ -27886,5 +27975,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Anotacións"
@@ -27892,5 +27981,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Tarxeta de recarga e moedeitos electrónicos"
@@ -27898,5 +27987,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Tarxetas de débito"
@@ -27904,15 +27993,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Tarxetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Tarxetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Reciclaxe"
@@ -27921,5 +28010,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Editar punto limpo"
@@ -27927,35 +28016,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Latas"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Roupas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Papeleiras"
@@ -27963,5 +28052,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Editar papeleiras"
@@ -27970,31 +28059,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Respaldo"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "pedra"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Cor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "negro"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "marrón"
@@ -28073,39 +28162,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "verde"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "vermello"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "branco"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Numero de asentos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Apostadeiro de caza"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadeiro de caza"
@@ -28114,30 +28203,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Alto"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Agochar"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Bloquear"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Fonte"
@@ -28146,10 +28235,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Editar fonte"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Auga potable"
@@ -28158,10 +28247,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Editar auga potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Hidrante contra incendios"
@@ -28170,5 +28259,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Editar hidrante contra incendios"
@@ -28176,5 +28265,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Caixa temperada"
@@ -28182,15 +28271,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Editar caixa temperada"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Tendas"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Concesionario de automóviles"
@@ -28198,10 +28287,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Editar concesionario de automóviles"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Tenda de bicicletas"
@@ -28210,28 +28299,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Editar tenda de bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Tenda de alimentación"
@@ -28239,9 +28328,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Editar tenda de alimentación"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Quiosco"
@@ -28249,27 +28338,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Editar quiosco"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Librería"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Axencia de viaxes"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Editar axencia de viaxes"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Carnicería"
@@ -28277,9 +28366,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Panadeiro"
@@ -28287,9 +28376,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Editar panadeiro"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Floristería"
@@ -28297,18 +28386,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Orgánico"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Editar tenda de productos orgánicos"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Tenda de bebidas alcohólicas"
@@ -28316,54 +28405,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Editar tenda de bebidas alcohólicas"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Brebaxes"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Editar tenda de brebaxes"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Ordenador"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Editar tenda de ordenadores"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Editar tenda de electrónica"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Editar tenda HIfi"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Mobles"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Editar Moblería"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Centro de xardinería"
@@ -28371,9 +28460,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Editar centro de xardinería"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Ferretería"
@@ -28381,9 +28470,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Editar ferretería"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaxe"
@@ -28391,54 +28480,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaxe"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Perruqueria"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Editar perruquería"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Xoguetes"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Editar Xoguetería"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Vídeo"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Editar tenda de vídeos"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -28446,9 +28535,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Lavandería"
@@ -28456,9 +28545,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Editar Lavandería"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Exteriores"
@@ -28466,24 +28555,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Editar tenda de exteriores"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Editar tenda de materiais deportivos"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Óptica"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -28491,5 +28580,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -28497,97 +28586,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "Billetes de transporte público"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "Bonos de transporte público"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "Tickets de aparcamento"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "doces"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "comida para animais"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "Xornáis"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "xoguetes"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "selos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "Tarxetas SIM"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "Tarxetas telefónicas"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr "tubo_de_bicicleta"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "gomas do pito"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampóns"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Tarxetas de afidelización ou de desconto"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Cartos en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Banco"
@@ -28595,14 +28684,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Caixeiro automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Cambio de moeda"
@@ -28610,5 +28699,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moeda"
@@ -28616,15 +28705,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Editar Caixeiro"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Saúde"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Médicos"
@@ -28632,18 +28721,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Editar médicos"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -28651,5 +28740,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia"
@@ -28657,9 +28746,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Expende baixo receta médica"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Hospital"
@@ -28667,10 +28756,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emerxencias"
@@ -28679,5 +28768,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emerxencias"
@@ -28686,20 +28775,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Número do punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Nome do Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -28707,5 +28796,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -28714,64 +28803,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Xeografía"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Estado"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Editar estado"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Rexión"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Editar rexión"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "País"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Editar país"
@@ -28779,15 +28868,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Cidade"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Editar cidade"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Vila"
@@ -28795,10 +28884,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Editar Vila"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Suburbio"
@@ -28806,25 +28895,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Editar suburbio"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Poboación"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Editar poboación"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Aldea"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Editar aldea"
@@ -28832,5 +28921,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Localidade"
@@ -28838,10 +28927,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Editar Localidade"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Illa"
@@ -28849,10 +28938,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Editar Illa"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Illote"
@@ -28860,5 +28949,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Editar Illote"
@@ -28866,5 +28955,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Entrada de cova"
@@ -28872,10 +28961,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cova"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Pico"
@@ -28883,10 +28972,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Glaciar"
@@ -28894,10 +28983,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Volcán"
@@ -28905,70 +28994,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Fronteiras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Editar fronteira nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Editar fronteira administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Editar fronteira civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Política"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Editar fronteira política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Editar límites do parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Uso do chan"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Árbore"
@@ -28977,15 +29066,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Editar árbore"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Nome botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Madeira"
@@ -28994,5 +29083,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -29000,17 +29089,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "decíduos"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Monte"
@@ -29019,14 +29108,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Reserva Natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Editar Reserva Natural"
@@ -29034,25 +29123,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Cantos"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Editar cantos"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Caída"
@@ -29060,10 +29149,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Editar Caída"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -29071,5 +29160,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -29077,5 +29166,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -29084,45 +29173,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Terra de labor"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Editar o uso da terra de labor"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Prado"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Editar o uso do prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Editar o uso do viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Área cultivábel"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "eitar o uso da área cultivábel"
@@ -29130,25 +29219,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Xardín"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Editar Xardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Herba"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Editar o uso ta área de herba"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Parque Municipal"
@@ -29156,10 +29245,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Común"
@@ -29167,20 +29256,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Editar común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Terra de recreo"
@@ -29188,5 +29277,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar o uso da área de recreo"
@@ -29194,15 +29283,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Editar o uso da área residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Camposanto (para os cementerios próximos ás igrexas)"
@@ -29210,9 +29299,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Editar camposanto"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Cemiterio"
@@ -29220,39 +29309,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Editar a área do cemiterio"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Comercios"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Editar o uso da área comercial"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Editar o uso da área industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Via do tren"
@@ -29260,15 +29349,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Editar o uso da área da via do tren"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Editar o uso da área militar"
@@ -29276,50 +29365,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Área de construcción"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Editar o uso da área en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Zona industrial abandoada"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno abandoado"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Zona verde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Editar zona verde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Vertedoiro"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedoiro"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Canteira"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Editar o uso da área da canteira"
@@ -29329,5 +29418,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -29339,5 +29428,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "segmento exterior"
@@ -29345,5 +29434,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "segmento interior"
@@ -29351,5 +29440,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr "Límite"
@@ -29360,5 +29449,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr "Editar límite"
@@ -29366,36 +29455,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr "Tipo de límite"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr "administrativo"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr "nacional"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr "civil"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr "político"
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr "Nivel administrativo"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr "Subárea"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr "Centro de Administración"
@@ -29403,5 +29492,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Restricción de xiro"
@@ -29410,5 +29499,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Editar as restriccións de xiro"
@@ -29416,34 +29505,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "non_xirar_esquerda"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "non_xirar_dereita"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "non_seguir_de_frente"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "prohibido xiro en U"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "só_xirar_dereita"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "só_xirar_esquerda"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "só_seguir_de_frente"
@@ -29452,15 +29541,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "da vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "a través de nodo ou vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "á via"
@@ -29468,5 +29557,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Ruta"
@@ -29475,5 +29564,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -29481,5 +29570,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Tipo de Ruta"
@@ -29587,5 +29676,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29596,17 +29685,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "camiño"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "ski"
@@ -29674,5 +29763,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29682,9 +29771,9 @@
 msgstr "pé"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "desvío"
@@ -29698,10 +29787,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Descición de símbolo"
@@ -29709,31 +29798,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Rede"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "conexión"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -29742,30 +29831,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "segmento da ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "segmento seguinte"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -29992,5 +30081,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "obsoleto"
@@ -30643,4 +30732,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30744,11 +30841,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "feito polo home"
@@ -31261,5 +31358,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "porto"
@@ -31273,5 +31370,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "tubería"
@@ -31415,13 +31512,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "ocio"
@@ -31435,5 +31532,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "porto deportivo"
@@ -31529,10 +31626,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "servizos"
@@ -31634,10 +31731,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "tráfico de ocio"
@@ -32075,24 +32172,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "equipamento lumínico"
@@ -32124,6 +32221,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "auga (claro)"
@@ -32184,8 +32281,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "saúde"
@@ -32538,26 +32635,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "tenda"
@@ -32629,8 +32726,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -32731,9 +32828,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turismo"
@@ -32821,9 +32918,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "patrimonio histórico"
@@ -32836,5 +32933,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "canteira"
@@ -32848,5 +32945,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "vertedoiro"
@@ -32868,5 +32965,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "cunca"
@@ -32880,5 +32977,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "edificio agrario"
@@ -32901,5 +32998,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "venta ao por menor"
@@ -32913,5 +33010,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "industrial"
@@ -32925,5 +33022,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -32937,5 +33034,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "zona verde"
@@ -32949,5 +33046,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -33004,7 +33101,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "zona militar"
@@ -33018,5 +33115,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "cemiterio"
@@ -33029,5 +33126,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "pico"
@@ -33042,5 +33139,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "glaciar"
@@ -33054,5 +33151,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "volcán"
@@ -33107,8 +33204,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "espazo natural"
@@ -33122,5 +33219,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "matorral"
@@ -33134,5 +33231,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "monte"
@@ -33146,5 +33243,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "área forestal"
@@ -33158,5 +33255,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "lodazal"
@@ -33170,5 +33267,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "praia"
@@ -33246,8 +33343,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "ruta"
@@ -33336,12 +33433,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "fronteira"
@@ -33491,11 +33588,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "lugar"
@@ -33509,5 +33606,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "datos_TIGER"
@@ -33863,9 +33960,11 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid "closedway"
-#~ msgstr "vía pechada"
-
-#~ msgid "Do not show again"
-#~ msgstr "Non amosar de novo"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "A via seleccionada non contén o nodo seleccionado."
+#~ msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Grados Minutos Segundos"
 
 #~ msgid "Be sure to include the following information:"
@@ -33927,4 +34026,7 @@
 #~ msgstr ""
 #~ "Podes usar o rato ou Ctrl+Teclas de cursor/./ para facer zoom e desprazar"
+
+#~ msgid "closedway"
+#~ msgstr "vía pechada"
 
 #~ msgid "Edit Properties"
@@ -34072,7 +34174,4 @@
 #~ msgid "my version:"
 #~ msgstr "a miña versión:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versión final:"
 
 #~ msgid "Select a bookmark first."
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 22568)
+++ applications/editors/josm/i18n/po/he.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-11 20:39+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 12:21+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Hebrew <he@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-07-28 09:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -229,5 +228,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -243,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -261,11 +260,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -273,20 +273,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -319,5 +319,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "מזג"
@@ -385,5 +385,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -397,5 +397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -417,4 +417,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -431,6 +432,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -442,5 +443,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -575,22 +576,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "שלב דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "שלב מספר דרכים לאחת."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "לשנות כיוונים?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "הפוך כיוון ואחד"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -598,5 +599,5 @@
 msgstr "לא ניתן לשלב את הדרכים בכיווניהם הנוכחיים. האם ברצונך להפוך כמה מהם?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -604,10 +605,10 @@
 msgstr "לא ניתן לשלב דרכים (לא ניתן למזג אותן למחרוזת אחת של צמתים)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "שלב {0} דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "נא בחר לפחות שתי דרכים לשילוב."
@@ -653,10 +654,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -794,5 +795,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -858,10 +859,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "ייצא ל-GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "ייצא נתונים לקובץ GPX."
@@ -1051,5 +1052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "כתובת"
@@ -1462,20 +1463,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1499,5 +1500,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1508,6 +1509,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "שגיאה"
@@ -1534,5 +1535,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1540,5 +1541,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "שמור את הנתונים הנוכחיים."
@@ -1595,10 +1596,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "שמור בשם..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "שמור את המידע הנוכחי לקובץ חדש."
@@ -1642,5 +1643,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1667,5 +1668,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr ""
@@ -1734,18 +1735,24 @@
 msgstr[1] "פשט דרך (הסר {0} נקודות)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "פצל דרך"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "פצל דרך בנקודה הבחורה."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "הבחירה הנוכחית אינה יכולה לשמש לפיצול."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "הנקודות הבחורות אינן שייכות לאותה דרך."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1753,5 +1760,5 @@
 msgstr[1] "הנקודות הנבחרות לא נמצאות בתוך אף דרך."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1763,20 +1770,10 @@
 msgstr[1] "יותר מדרך אחת משתמשת בנקודות שבחרת. בחר גם את הדרך."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "הנקודות הבחורות אינן שייכות לאותה דרך."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
-msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "אתה חייב לבחור שתי נקודות או יותר כדי לפצל דרך מעגלית."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1784,5 +1781,5 @@
 msgstr "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1790,5 +1787,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1796,5 +1793,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1938,5 +1935,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2906,22 +2903,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3062,25 +3059,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#, java-format
+msgid "Delete node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#, java-format
+msgid "Delete way {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
-msgid "Delete node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
-#, java-format
-msgid "Delete way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
-#, java-format
 msgid "Delete relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3089,5 +3086,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3096,5 +3093,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3103,5 +3100,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3110,5 +3107,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3260,5 +3257,5 @@
 msgstr "החל?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3331,17 +3328,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "לא יכול לקבל נתיב קנוני לתיקייה {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "שגיאה ביצירת ספריית מטמון: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3511,42 +3508,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "מעלות דקות שניות"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "דרום"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "צפון"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "מערב"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "מזרח"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3554,5 +3554,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3721,5 +3721,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "רקע"
@@ -3863,5 +3863,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr ""
@@ -3889,5 +3889,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "מסילת רכבת"
@@ -3909,6 +3909,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -3977,5 +3977,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "בניין"
@@ -4062,5 +4062,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4161,69 +4161,69 @@
 msgstr "סיסמא"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "שימוש"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "אפשרויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "הצג עזרה זו"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "הורד את המיקום שבכתובת (עם lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "בחר עם החיפוש הנתון"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "אפס את המאפיינים לברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4233,9 +4233,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "דוגמאות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4243,46 +4243,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "מאתחל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "טען תוספים מוקדמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "קביעת ברירות מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "יוצר ממשקי גרפי ראשי"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "טעינת תוספים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "פתור"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4291,5 +4290,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4385,33 +4384,33 @@
 msgstr "ריחוק צפיה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "הגדלה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "קו האורך הגיאוגרפי בסמן העכבר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "שם העצם בסמן העכבר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "קו הרוחב הגיאוגרפי בסמן העכבר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "הזווית בין קטע הדרך הקודם לנוכחי"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "כיוון (המצפן) של קטע הדרך מצויר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "אורך קטע הדרך החדש מצויר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4419,9 +4418,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(אין עצם)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4437,4 +4436,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "שירות"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "בחר"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "מסחרי"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5150,5 +5164,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "הכל"
@@ -5231,6 +5245,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5241,5 +5255,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5368,5 +5382,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr ""
@@ -5427,5 +5441,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5584,5 +5598,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5590,5 +5604,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5596,5 +5610,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5602,5 +5616,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5608,5 +5622,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5615,5 +5629,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5621,5 +5635,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5627,5 +5641,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5633,24 +5647,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5730,51 +5744,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "שכבות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "פתח רשימה המכילה את כל השכבות שנטענו."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "מחליף את המצב החזותי של השכבה הנבחרת."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "הצג/הסתר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "מחליף את המצב החזותי של השכבה הנבחרת."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "העבר את השכבה הנבחרת שורה אחת מעלה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "העבר את השכבה הנוכחית שורה אחת מטה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr ""
@@ -5784,5 +5798,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "יחסים"
@@ -6935,6 +6949,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6982,107 +6997,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "שם"
@@ -7420,5 +7435,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7505,5 +7520,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<שונה>"
@@ -8231,5 +8246,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8302,8 +8317,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "סוג"
@@ -8332,6 +8347,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "לא ידוע"
@@ -8652,5 +8667,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr ""
@@ -8709,14 +8724,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "ספק הערה קצרה לשינויים שאתה מעלה:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "הכנס את התגובה שלך"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9147,5 +9163,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9167,5 +9183,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9173,60 +9189,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "העלה שינויים"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "אפס"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "המשך"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "אל תציג שוב"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9546,103 +9594,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "נקודת gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "התאם ציור קו"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "השתמש בהגדרות הגלובליות."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "צייר קווים בין נקודות בשכבה זו."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "אל תצייר קווים בין נקודות בשכבה זו."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "בחר אפשרויות ציור קו"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "התאם צבעים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "ברירת מחדל"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "בחר צבע"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "סמנים מנקודות בעלות שם"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "ייבא שמע"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "קובץ שמע (wav.*)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "סמן שמע מ {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "ייבא תמונות"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9650,5 +9606,5 @@
 msgstr "שם: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9656,5 +9612,5 @@
 msgstr "תיאור: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9664,23 +9620,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "תיאור"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "אורך: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9689,5 +9645,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9696,10 +9652,10 @@
 msgstr[1] "{0} נקודות דרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "המר לשכבת נתונים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9709,21 +9665,21 @@
 "מסלולים, ראה כאן:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "המר מ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9731,10 +9687,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "הורד הכל עם:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9742,10 +9698,10 @@
 msgstr "{0} מטרים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "שטח מירבי לבקשה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9753,21 +9709,21 @@
 msgstr "{0} קמ\"ר"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9779,9 +9735,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9789,5 +9745,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9797,23 +9753,115 @@
 "באופן הגיוני הושמטו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "התאם ציור קו"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "השתמש בהגדרות הגלובליות."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "צייר קווים בין נקודות בשכבה זו."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "אל תצייר קווים בין נקודות בשכבה זו."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "בחר אפשרויות ציור קו"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "התאם צבעים"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "ברירת מחדל"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "בחר צבע"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "סמנים מנקודות בעלות שם"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "ייבא שמע"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "קובץ שמע (wav.*)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "סמן שמע מ {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "ייבא תמונות"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "שכבת נתונים {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "מחוץ לשטח שהורד"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "גירסה {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9822,11 +9870,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9835,36 +9883,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} מורכב מ-:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "גירסת API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "המר לשכבת GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9872,5 +9920,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9879,5 +9927,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -9885,5 +9933,5 @@
 msgstr[1] "נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -9892,5 +9940,5 @@
 msgstr[1] "מסלול בעל {0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -9899,5 +9947,5 @@
 msgstr[1] "{0} מורכב מ-{1} מסלולים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -9906,24 +9954,28 @@
 msgstr[1] "{0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "קבצי GPX‏ (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "שגיאה בעת ניתוח {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "לא ניתן לקרוא את \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9932,34 +9984,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "זמן צילום (מ-EXIF)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "זמן GPS (נקרא מהצילום למעלה): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "אני באזור זמן: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "אין תאריך"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "פתח תמונה אחרת"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -9967,93 +10019,93 @@
 msgstr "שגיאה בזמן ניתוח התאריך:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "תאריך שגוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "אזור זמן: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "היסט:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "אזור זמן שגוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "היסט שגוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10063,20 +10115,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10085,5 +10137,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10091,21 +10143,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10113,17 +10165,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10134,5 +10186,5 @@
 "פורמט מצופה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10143,56 +10195,52 @@
 "פורמט מצופה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "מחלץ מיקומי GPS מ-EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "מתחיל סריקת ספרייה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "קורא תמונות..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "קורא {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "לא יכול לקבל נתיב קנוני לתיקייה {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "קורא ספרייה {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "נמצא קובץ null בתיקייה {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "תמונות בעלות גאותגיות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10201,5 +10249,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10208,10 +10256,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10220,5 +10268,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10318,9 +10366,9 @@
 msgstr "תמונות JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "סמן gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10328,5 +10376,5 @@
 msgstr[1] "סמנים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10335,14 +10383,26 @@
 msgstr[1] "{0} מורכב מ-{1} סמנים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "סנכרן שמע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10350,30 +10410,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr "אתה צריך לעצור את השמע בנקודה על המסלול שבה אתה רוצה את הסמן."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11215,4 +11263,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr ""
@@ -11227,5 +11276,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11328,5 +11377,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "רק רמזי כיוון מעניינים (למשל עם תג חד-סטרי)."
@@ -11334,5 +11383,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "רק בראשית הדרך"
@@ -11362,5 +11411,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "מחבר"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "סירה"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11368,9 +11431,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11378,34 +11441,34 @@
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ''1-'' לציור כל הקווים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ''1-'' לציור כל הקווים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "אורך מירבי (מטרים)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "הכרח ציור קווים במידה והנתונים המיובאים אינם מכילים נתוני קווים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "צייר חצי כיוון לקווים המחברים נקודות GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "צייר את חצי הכיוון תוך שימוש בטבלת חיפוש במקום חישובים מסובכים."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11413,13 +11476,13 @@
 msgstr "אל תצייר חצים אם הם לא לפחות במרחק זה מהקודם."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "מרחק מינימלי (פיקסלים)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "צייר נקודות גדולות יותר עבור נקודות ה-GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11427,9 +11490,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11437,46 +11500,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "תמונת נקודת דרך"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "נקודות GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "צייר רמזי כיוון עבור קטעי דרך."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "צייר את המספרים הסידוריים של כל הקטעים בתוך הדרכים שלהם."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "צייר את גבולות המידע שמורד מהשרת."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "צייר נקודיות וירטואליות במצב הנבחר להקלת שינוי דרך"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "צייר את שכבת הנתונים הלא פעילה בצבע אחר."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "נתוני OSM"
@@ -11830,21 +11902,26 @@
 msgstr "יהיה עליך להפעיל את JOSM מחדש כדי שכמה מההגדרות יכנסו לתוקף."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "שיטת הטלה"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "הצג קורדינטות כ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "שיטת הטלה"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "שכבה לעריכת מדידות."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "הטלת מפה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12387,5 +12464,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12394,49 +12471,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "עוד מידע על הכלי הזה"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "מאפייני רשות:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "סוג לא ידוע: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12446,15 +12523,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "שגיאה בניתוח {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12464,17 +12541,17 @@
 msgstr[1] "שנה {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "כלום לא נבחר!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12492,7 +12569,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "חפש: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12501,17 +12577,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "חיפוש אחר פריטים."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "התאם מיקוד לבחירה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "חפש: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12808,5 +12881,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין."
@@ -14242,5 +14315,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14509,5 +14582,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr ""
@@ -14849,41 +14922,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -14900,25 +14973,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -14956,18 +15029,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "מבנים"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15191,8 +15264,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "מים"
@@ -15253,6 +15326,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "כתובת"
@@ -15718,34 +15791,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "שכבה ריקה"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15754,14 +15827,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -15838,22 +15911,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "מיקום ההורדה"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "הורד נתוני מפה משרת ה-OSM."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "הורדת איזור"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "אנא בחר לפחות משימה אחת להורדה"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -15868,7 +15937,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "שגיאה בניתוח {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -15899,9 +15968,9 @@
 msgstr "ייצר דרך משוכפלת"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15911,5 +15980,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -15918,11 +15987,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "ייבא נתיב משכבת GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "זנח נתיב קיים"
@@ -15932,5 +16001,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "לא נמצאה שכבת נתוני GPX"
@@ -15940,13 +16009,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16185,5 +16254,5 @@
 msgstr "הצג תמונות ללא תיוג גיאוגרפי"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "תמונות מיובאות"
@@ -16535,8 +16604,6 @@
 msgstr "פתח את חלון המדידות."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "אפס"
@@ -16567,5 +16634,5 @@
 msgstr "זווית בין שתי נקודות בחורות"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "שכבה לעריכת מדידות."
@@ -16657,5 +16724,5 @@
 msgstr "לולאת הורדה של OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -16719,13 +16786,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -16838,93 +16905,93 @@
 msgstr "קובץ הרצת פיירפוקס"
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -16966,9 +17033,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17146,20 +17213,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "הגירסה הפתורה:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "אשר את כל פעולות השלט רחוק ידנית"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "שלט רחוק"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "כיוונונים לתוסף \"שלט רחוק\""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17170,50 +17242,58 @@
 "לא זמין בגלל שהוא בשימוש ע\"י יישומים חיצוניים המדהרים עם התוסף."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "פעולות מורשות"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "שלט רחוק ביקש להוריד נתונים מה-API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "בקש פרטים: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "האם אתה רוצה לאשר את זה?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "אשר פעולת שלט רחוק"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "שלט רחוק מבקש לייבא נתונים מה-URL הבא:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17221,5 +17301,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "להחזיר לקדמותו"
@@ -17418,41 +17498,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "טען משטח"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "טען את כל המשטחים"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "הגדל"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "הקטן"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -17752,4 +17832,14 @@
 msgid "Terrace"
 msgstr "מדרג"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "מפריד"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18436,6 +18526,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18445,9 +18535,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18526,6 +18616,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18533,5 +18623,5 @@
 msgstr "שגיאת תקינות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "אין שגיאות תקינות"
@@ -18770,32 +18860,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "נקודות כפולות"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "נקודות כפולות"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "נקודות כפולות"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "נקודות כפולות"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "נקודות כפולות"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "נקודות כפולות"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -18832,5 +18916,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr ""
@@ -19349,5 +19433,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "שטח"
@@ -19483,10 +19567,10 @@
 msgstr "{0},..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19632,10 +19716,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -19821,28 +19905,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "הורדה אוטומטית"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -19853,65 +19933,69 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "הורד משטחים גלויים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "שנה רזולוציה"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "טען מחדש משטחים פגומים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "שמור שכבת WMS לקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "טען שכבת WMS מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "שגיאה בפורמט קובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "שגיאה בטעינת קובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "הורדה אוטומטית"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -19990,5 +20074,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20023,5 +20107,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20042,5 +20126,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "יער"
@@ -20059,22 +20143,19 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "גבול"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "מדידות"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "צינור"
+msgstr ""
 
 #. relation type
@@ -20086,43 +20167,37 @@
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "יצירת אומנות"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "מפות תחבורה ציבורית"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "תיאור"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "אמת"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "הדבק"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "נתיב מים"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20396,7 +20471,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "מוריד מידע של OSM..."
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20593,6 +20667,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20601,5 +20680,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20608,5 +20687,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20615,10 +20694,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20627,5 +20706,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20635,5 +20714,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20642,15 +20721,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20659,5 +20738,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20790,5 +20869,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "התייחסות"
@@ -21327,5 +21406,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21338,5 +21417,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr ""
@@ -21640,9 +21719,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "כן"
@@ -21752,9 +21831,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "לא"
@@ -22013,5 +22092,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "מגורים"
@@ -22060,5 +22139,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "שירות"
@@ -22093,5 +22172,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "בנייה"
@@ -22178,5 +22257,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr ""
@@ -22211,5 +22290,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22379,14 +22458,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "מפעיל"
@@ -22654,6 +22733,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "הגבהה"
@@ -23101,5 +23180,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "ביצה"
@@ -23505,5 +23584,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr ""
@@ -23867,31 +23946,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "שעות פתיחה"
@@ -23951,90 +24030,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24147,7 +24226,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr ""
@@ -24163,5 +24242,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr ""
@@ -24174,6 +24253,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr ""
@@ -24349,5 +24428,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr ""
@@ -24384,6 +24463,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "מקלט"
@@ -24391,5 +24470,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "ספסל"
@@ -24508,5 +24587,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr ""
@@ -24667,5 +24746,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr ""
@@ -24673,73 +24752,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "קבב"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "תורכי"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "אסייתי"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "תאילנדי"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "מקסיקני"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "יפני"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "מזון מהיר"
@@ -24747,17 +24831,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "ערוך מסעדת מזון מהיר"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "בית קפה"
@@ -24765,9 +24849,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "ערוך בית קפה"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "פאב"
@@ -24775,18 +24859,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "ערוך פאב"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "בר"
@@ -24794,9 +24879,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "ערוך בר"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "מועדון לילה"
@@ -24804,24 +24889,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "ערוך מועדון לילה"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "תיירות"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "מוזיאון"
@@ -24829,9 +24914,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "ערוך מוזיאון"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "גן חיות"
@@ -24840,9 +24925,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "ערוך גן חיות"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "נקודת תצפית"
@@ -24850,24 +24935,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "ערוך נקודת תצפית"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "מגדל תצפית"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "פארק שעשועים"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "ערוך פארק שעשועים"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "יצירת אומנות"
@@ -24875,5 +24960,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "ערוך יצירת אומנות"
@@ -24881,19 +24966,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "מפה"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -24931,5 +25016,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24937,28 +25022,28 @@
 msgstr "רחוב"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -24968,5 +25053,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -24974,5 +25059,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "צעידה"
@@ -24980,6 +25065,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "רכיבה"
@@ -24987,5 +25072,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -24993,6 +25078,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "סקי"
@@ -25000,5 +25085,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -25006,46 +25091,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "היסטוריה"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "טבע"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25053,29 +25145,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "ערוך מקלט"
@@ -25083,25 +25175,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "אתר פיקניק"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "ערוך אתר פיקניק"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "מקומות היסטורים"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "טירה"
@@ -25110,19 +25202,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "ערוך טירה"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "חורבות"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "ערוך חורבות"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "אתר ארכיאולוגי"
@@ -25131,9 +25223,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "ערוך אתר ארכיאולוגי"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "שדה קרב"
@@ -25141,10 +25233,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "ערוך שדה קרב"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25152,5 +25244,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25158,15 +25250,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "אנדרטה"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "ערוך אנדרטה"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "מצבת זיכרון"
@@ -25174,55 +25266,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "ערוך מצבת זיכרון"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "פנאי"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "פארק מים"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "ערוך פארק מים"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "מגרש משחקים"
@@ -25230,35 +25322,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "ערוך מגרש משחקים"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "דייג"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "ערוך דייג"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "מתקני ספורט"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "איצטדיון"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "ערוך איצטדיון"
@@ -25272,6 +25364,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "בחר ענף ספורט:"
@@ -25687,31 +25779,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "ספורט"
@@ -25721,240 +25813,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "קשתות"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "אתלטיקה"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "כדורגל אוסטרלי"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "כדור בסיס"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "כדורסל"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "כדורת דשא"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "קנו"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "טיפוס"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "קריקט"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "מירוץ כלבים"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "גולף"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "התעמלות"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "הוקי"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "מירוץ סוסים"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "סקייטבורד"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "סקייטים"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "סקי"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "כדורגל"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "שחייה"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "טניס שולחן"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "טניס"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "מרכז ספורט"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "ערוך מרכז ספורט"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "מסלול מירוצים"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "ערוך מסלול מירוצים"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "מגרש גולף"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "ערוך מגרש גולף"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "מיני-גולף"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "ערוך מיני-גולף"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "ספורט"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr ""
@@ -25996,23 +26088,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "סוג"
@@ -26054,211 +26146,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "מרכז ספורט"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "איצטדיון"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "אתלטיקה"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "ערוך אתלטיקה"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "קשתות"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "ערוך קשתות"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "טיפוס"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "ערוך טיפוס"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "ערוך רכיבה"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "מירוץ כלבים"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "ערוך מירוץ כלבים"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "מירוץ סוסים"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "ערוך מירוץ סוסים"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "התעמלות"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "ערוך התעמלות"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "ספורט מוטורי"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "ערוך ספורט מוטורי"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "סקייטבורד"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "ערוך סקייטבורד"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "שחייה"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "ערוך שחייה"
@@ -26266,52 +26358,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "ערוך סקי"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "סוג מסלול"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "גלישה במורד"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "פארק שלג"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "קושי"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "מתחילים"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "קל"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "מקצוענים"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "ירי"
@@ -26319,204 +26411,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "ערוך ירי"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "ספורט (משחקי כדור)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "כדורגל"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "ערוך כדורגל"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "כדורגל אוסטרלי"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "ערוך כדורגל אוסטרלי"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "כדור בסיס"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "ערוך כדור בסיס"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "כדורסל"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "ערוך כדורסל"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "גולף"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "ערוך גולף"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "מגרש גולף"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "כדורת דשא"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "ערוך כדורת דשא"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "הוקי"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "ערוך הוקי"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "טניס שולחן"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "ערוך טניס שולחן"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "טניס"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "ערוך טניס"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "מבנה"
@@ -26524,5 +26616,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "מבנה ציבור"
@@ -26530,10 +26622,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "ערוך מבנה ציבור"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "בניין העירייה"
@@ -26541,10 +26633,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "ערוך בניין העירייה"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "שגרירות"
@@ -26552,10 +26644,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "ערוך שגרירות"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "בית משפט"
@@ -26564,10 +26656,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "ערוך בית משפט"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "כלא"
@@ -26576,10 +26668,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "ערוך כלא"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "משטרה"
@@ -26589,10 +26681,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "ערוך משטרה"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "תחנת מכבי אש"
@@ -26601,10 +26693,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "ערוך תחנת מכבי אש"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "דואר"
@@ -26612,5 +26704,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "ערוך דואר"
@@ -26618,15 +26710,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "ערוך גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "בית ספר"
@@ -26634,10 +26726,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "ערוך בית ספר"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "אוניברסיטה"
@@ -26645,10 +26737,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "ערוך אוניברסיטה"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "מכללה"
@@ -26656,5 +26748,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "ערוך מכללה"
@@ -26662,5 +26754,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "קולנוע"
@@ -26669,10 +26761,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "ערוך קולנוע"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "ספרייה"
@@ -26681,9 +26773,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "ערוך ספרייה"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "מרכז אומנויות"
@@ -26691,10 +26783,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "ערוך מרכז אומנויות"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "תיאטרון"
@@ -26703,10 +26795,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "ערוך תיאטרון"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "מקום תפילה"
@@ -26716,5 +26808,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "ערוך מקום תפילה"
@@ -26723,6 +26815,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "דת"
@@ -26731,66 +26823,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "בהאי"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "בודהיסט"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "נוצרי"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "הינדי"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "יהודי"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "מוסלמי"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "סיקי"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "ספיריטואליסט"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "טאואיסט"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr ""
@@ -26799,81 +26891,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "אנגליקני"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "באפטיסט"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "קתולי"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "לותרני"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "מתודיסט"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "מורמוני"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "אורתודוקסי"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "פרוטסטנטי"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "שיעי"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "סוני"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "כתובות"
@@ -26882,5 +26974,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "ערוך כתובת"
@@ -26888,5 +26980,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "מספר בית"
@@ -26894,25 +26986,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "שם בית"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "שם רחוב"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "שם עיר"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "מיקוד"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "קוד מדינה"
@@ -26921,5 +27013,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -26927,61 +27019,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "סכמת מספור"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "אי-זוגי"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "זוגי"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "מעשה אדם"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "מגדל"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "ערוך מגדל"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -26989,25 +27081,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "מגדל מים"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "ערוך מגדל מים"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "מגדלור"
@@ -27015,10 +27107,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "ערוך מגדלור"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "טחנת רוח"
@@ -27026,10 +27118,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "ערוך טחנת רוח"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "צינור"
@@ -27038,41 +27130,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "ערוך צינור"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "מיקום"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr ""
@@ -27082,10 +27174,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr ""
@@ -27093,5 +27185,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr ""
@@ -27099,10 +27191,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr ""
@@ -27110,10 +27202,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr ""
@@ -27121,23 +27213,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr ""
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr ""
@@ -27147,35 +27239,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "תחנת כח"
@@ -27184,10 +27276,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "ערוך תחנת כח"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr ""
@@ -27196,5 +27288,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -27202,10 +27294,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "עמוד חשמל"
@@ -27216,23 +27308,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "ערוך עמוד חשמל"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "קו מתח"
@@ -27241,21 +27333,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "ערוך קו מתח"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "צינור"
-
-#: build/trans_presets.java:2452
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27263,55 +27354,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "שירותים"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "תיבת דואר"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "טלפון"
@@ -27320,5 +27411,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "ערוך טלפון"
@@ -27326,5 +27417,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr ""
@@ -27332,5 +27423,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr ""
@@ -27338,5 +27429,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27344,5 +27435,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr ""
@@ -27350,15 +27441,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "כרטיסי טלפון"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr ""
@@ -27367,5 +27458,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "ערוך תחנת מיחזור"
@@ -27373,35 +27464,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27409,5 +27500,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27416,31 +27507,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr ""
@@ -27519,39 +27610,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "ירוק"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27560,30 +27651,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "מזרקה"
@@ -27592,10 +27683,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "ערוך מזרקה"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "מי שתיה"
@@ -27604,10 +27695,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "ערוך מי שתיה"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -27616,5 +27707,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27622,5 +27713,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr ""
@@ -27628,15 +27719,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "חנויות"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -27644,10 +27735,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "ערוך חנות רכב"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -27656,28 +27747,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "ערוך חנות אופניים"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "סופרמרקט"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "ערוך סופרמרקט"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "מכולת"
@@ -27685,9 +27776,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "ערוך מכולת"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "קיוסק"
@@ -27695,27 +27786,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "ערוך קיוסק"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "קצבייה"
@@ -27723,9 +27814,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "ערוך קצבייה"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "מאפייה"
@@ -27733,9 +27824,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "ערוך מאפייה"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "פרחים"
@@ -27743,18 +27834,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "ערוך חנות פרחים"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "ערוך חנות אורגנית"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr ""
@@ -27762,54 +27853,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "ערוך חנות מחשבים"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "ערוך חנות אלקטרוניקה"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "ערוך חנות רהיטים"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr ""
@@ -27817,9 +27908,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr ""
@@ -27827,9 +27918,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "חנות עשה-זאת-בעצמך"
@@ -27837,54 +27928,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "ערוך חנות עשה-זאת-בעצמך"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "מספרה"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "ערוך מספרה"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "ערוך חנות נעליים"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "ערוך חנות צעצועים"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "ערוך חנות וידאו"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "ניקוי יבש"
@@ -27892,9 +27983,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "ערוך ניקוי יבש"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "מכבסה"
@@ -27902,9 +27993,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "ערוך מכבסה"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr ""
@@ -27912,24 +28003,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "ערוך חנות ספורט"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "ערוך אופטיקאי"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "מכונת ממכר"
@@ -27937,5 +28028,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "ערוך מכונת ממכר"
@@ -27943,97 +28034,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "כרטיסים לתחבורה ציבורית"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "מפות תחבורה ציבורית"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "כרטיסי חניה"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "מזון"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "משקאות"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "ממתקים"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "סיגריות"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "תמונות"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "מזון בע\"ח"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "עיתונים"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "צעצועים"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "בולים"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "כרטיס SIM"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "שוברי טלפון"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "שוברים"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "קונדומים"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "טמפונים"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "שקיות צואה"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "מזומן"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "בנק"
@@ -28041,14 +28132,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "ערוך בנק"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "כספומט"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "החלפת כסף"
@@ -28056,5 +28147,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "ערוך החלפת כסף"
@@ -28062,15 +28153,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "ערוך כספומט"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "בריאות"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "רופאים"
@@ -28078,18 +28169,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "ערוך רופאים"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "רופא שיניים"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "ערוך רופא שיניים"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "בית מרקחת"
@@ -28097,5 +28188,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "ערוך בית מרקחת"
@@ -28103,9 +28194,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "בית חולים"
@@ -28113,10 +28204,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "ערוך בית חולים"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "נקודת גישה בחירום"
@@ -28125,5 +28216,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "ערוך נקודת גישה בחירום"
@@ -28132,20 +28223,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "מספר נקודה"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "מספר טלפון"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
@@ -28153,5 +28244,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "וטרינרי"
@@ -28160,64 +28251,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "ערוך וטרינרי"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "מקומות"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "יבשת"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "ערוך יבשת"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "ארץ"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "ערוך ארץ"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "מדינה"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "ערוך מדינה"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "אזור"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "ערוך אזור"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "מחוז"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "ערוך מחוז"
@@ -28225,15 +28316,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "עיר"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "ערוך עיר"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "עיירה"
@@ -28241,10 +28332,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "ערוך עיירה"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "פרבר"
@@ -28252,25 +28343,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "ערוך פרבר"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "כפר"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "ערוך כפר"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "כפר קטן"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "ערוך כפר קטן"
@@ -28278,5 +28369,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "מקומיות"
@@ -28284,10 +28375,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "ערוך מקומיות"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "אי"
@@ -28295,10 +28386,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "ערוך אי"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -28306,5 +28397,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -28312,5 +28403,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "פתח מערה"
@@ -28318,10 +28409,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "ערוך פתח מערה"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "פסגה"
@@ -28329,10 +28420,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "ערוך פסגה"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "קרחון"
@@ -28340,10 +28431,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "ערוך קרחון"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "הר געש"
@@ -28351,70 +28442,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "ערוך הר געש"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "גבולות"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "לאומי"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "ערוך גבול לאומי"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "מנהלי"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "ערוך גבול מנהלי"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "אזרחי"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "ערוך תחום אזרחי"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "פוליטי"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "ערוך תחום פוליטי"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "גן לאומי"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "ערוך תחום גן לאומי"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "עץ"
@@ -28423,15 +28514,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "ערוך עץ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "שם בוטני"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "חורש"
@@ -28440,5 +28531,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "ערוך חורש"
@@ -28446,17 +28537,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "מחטני"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "נשיר"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "מעורב"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "יער"
@@ -28465,14 +28556,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -28480,25 +28571,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr ""
@@ -28506,10 +28597,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "שדה-בור"
@@ -28517,5 +28608,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "ערוך שדה-בור"
@@ -28523,5 +28614,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "חצר משק"
@@ -28530,45 +28621,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "אדמה חקלאית"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "כרם"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28576,25 +28667,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "דשא"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -28602,10 +28693,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr ""
@@ -28613,20 +28704,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr ""
@@ -28634,5 +28725,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -28640,15 +28731,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "אזור מגורים"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "בית-קברות"
@@ -28656,9 +28747,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "ערוך בית-קברות"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "בית עלמין"
@@ -28666,39 +28757,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "קמעוני"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "מסחרי"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "תעשייתי"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr ""
@@ -28706,15 +28797,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "צבאי"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr ""
@@ -28722,50 +28813,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "אתר בניה"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "מחצבה"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -28775,5 +28866,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr ""
@@ -28785,5 +28876,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr ""
@@ -28791,5 +28882,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr ""
@@ -28797,5 +28888,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -28806,5 +28897,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -28812,36 +28903,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -28849,5 +28940,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr ""
@@ -28856,5 +28947,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -28862,34 +28953,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr ""
@@ -28898,15 +28989,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr ""
@@ -28914,5 +29005,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr ""
@@ -28921,5 +29012,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr ""
@@ -28927,5 +29018,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr ""
@@ -29033,5 +29124,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29042,17 +29133,17 @@
 msgstr "אופניים"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "אוטובוס"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29120,5 +29211,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29128,9 +29219,9 @@
 msgstr "רגל"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr ""
@@ -29144,10 +29235,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "רכבת תחתית"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr ""
@@ -29155,31 +29246,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr ""
@@ -29188,30 +29279,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29438,5 +29529,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "מיושן"
@@ -30089,4 +30180,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30190,11 +30289,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "מעשה אדם"
@@ -30707,5 +30806,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "מזח"
@@ -30719,5 +30818,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "צינור"
@@ -30861,13 +30960,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "פנאי"
@@ -30881,5 +30980,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr ""
@@ -30975,10 +31074,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr ""
@@ -31080,10 +31179,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -31521,24 +31620,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -31570,6 +31669,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -31630,8 +31729,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "בריאות"
@@ -31984,26 +32083,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "חנות"
@@ -32075,8 +32174,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "מלון"
@@ -32177,9 +32276,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "תיירות"
@@ -32267,9 +32366,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "היסטורי"
@@ -32282,5 +32381,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "מחצבה"
@@ -32294,5 +32393,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr ""
@@ -32314,5 +32413,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr ""
@@ -32326,5 +32425,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr ""
@@ -32347,5 +32446,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "קמעוני"
@@ -32359,5 +32458,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "תעשייתי"
@@ -32371,5 +32470,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr ""
@@ -32383,5 +32482,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr ""
@@ -32395,5 +32494,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr ""
@@ -32450,7 +32549,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "צבאי"
@@ -32464,5 +32563,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "בית עלמין"
@@ -32475,5 +32574,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "פיסגה"
@@ -32488,5 +32587,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "קרחון"
@@ -32500,5 +32599,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "הר געש"
@@ -32553,8 +32652,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "טבעי"
@@ -32568,5 +32667,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr ""
@@ -32580,5 +32679,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr ""
@@ -32592,5 +32691,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -32604,5 +32703,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "בוץ"
@@ -32616,5 +32715,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "חוף"
@@ -32692,8 +32791,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr ""
@@ -32782,12 +32881,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "גבול"
@@ -32937,11 +33036,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "מקום"
@@ -32955,5 +33054,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33309,4 +33408,12 @@
 msgstr ""
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
+#~ msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "מעלות דקות שניות"
+
 #~ msgid "Move"
 #~ msgstr "הזז"
@@ -33397,7 +33504,4 @@
 #~ msgid "their version:"
 #~ msgstr "הגירסה שלהם:"
-
-#~ msgid "resolved version:"
-#~ msgstr "הגירסה הפתורה:"
 
 #~ msgid "{0} object has conflicts:"
@@ -33451,7 +33555,4 @@
 #~ "שגיאה פנימית: לא ניתן לבדוק תנאים לשכבה שלא נבחרה. אנא דווח על זאת כעל "
 #~ "תקלה."
-
-#~ msgid "Do not show again"
-#~ msgstr "אל תציג שוב"
 
 #~ msgid "Please report a ticket at {0}"
@@ -33704,7 +33805,4 @@
 #~ msgstr "בחר משתמש בעזרת פאנל המחברים"
 
-#~ msgid "Boat"
-#~ msgstr "סירה"
-
 #~ msgid "Motorboat"
 #~ msgstr "סירת מנוע"
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 22568)
+++ applications/editors/josm/i18n/po/is.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-11 20:27+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 12:00+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@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-07-28 09:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -225,5 +224,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -239,5 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -257,11 +256,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -269,20 +269,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -316,5 +316,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Sameina"
@@ -382,5 +382,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -394,5 +394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -414,4 +414,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -428,6 +429,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -439,5 +440,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -572,22 +573,22 @@
 msgstr "Sæki opin breytingarsett ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Sameina vegi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Sameina marga vegi í einn."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Skipta um átt?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Skipta um átt og sameina"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -597,5 +598,5 @@
 "haldist sér. Vilt þú skipta um átt sumra þeirra?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -605,10 +606,10 @@
 "að sameina þá þurfa þeir að vera ein samfelld röð af hnútum"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sameina {0} vegi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina."
@@ -653,10 +654,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -794,5 +795,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -858,10 +859,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Vista sem GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Vista gögnin í GPX sniði."
@@ -1051,5 +1052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr ""
@@ -1462,20 +1463,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1499,5 +1500,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1508,6 +1509,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Villa"
@@ -1534,5 +1535,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1540,5 +1541,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Vista þau gögn sem sjást núna."
@@ -1593,10 +1594,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Vista sem..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Vista þau gögn sem sjást núna í nýja skrá."
@@ -1641,5 +1642,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1666,5 +1667,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr ""
@@ -1733,18 +1734,23 @@
 msgstr[1] "Einfalda veg (fjarlægja {0} hnúta)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Skipta veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Skipta veg á völdum hnút(um)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Valdir hnútar eru ekki hluti af sama veg"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1756,5 +1762,5 @@
 "hnúta eða hnúta á enda vegs."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1770,20 +1776,10 @@
 "veginn sem þú vilt skipta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Valdir hnútar eru ekki hluti af sama veg"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir."
-msgstr[1] "Vegirnir sem þú valdir innihalda ekki hnútana sem þú valdir."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Þú verður að velja tvo eða fleiri hnúta til að skipta hringlaga veg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1791,5 +1787,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1797,5 +1793,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1803,5 +1799,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1945,5 +1941,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2912,22 +2908,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3068,25 +3064,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#, java-format
+msgid "Delete node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#, java-format
+msgid "Delete way {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
-msgid "Delete node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
-#, java-format
-msgid "Delete way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
-#, java-format
 msgid "Delete relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3095,5 +3091,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3102,5 +3098,5 @@
 msgstr[1] "Eyða {0} hnútum"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3109,5 +3105,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3116,5 +3112,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3267,5 +3263,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3518,8 +3514,15 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
 msgstr ""
 
@@ -3527,33 +3530,29 @@
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "V"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "A"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3561,5 +3560,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3728,5 +3727,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "bakgrunnur"
@@ -3870,5 +3869,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr ""
@@ -3896,5 +3895,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr ""
@@ -3916,6 +3915,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -3984,5 +3983,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "bygging"
@@ -4069,5 +4068,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4162,69 +4161,69 @@
 msgstr "Lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4234,9 +4233,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4244,46 +4243,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Upphafsstilli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Bý til aðal notandaviðmót"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Hleð inn viðbótum"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Leysa"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4292,5 +4290,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4386,33 +4384,33 @@
 msgstr "Þysja út"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "skali"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Lengdargráðan undir músabendlinum."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Breiddargráðan undir músabendlinum."
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+msgid "The angle between the previous and the current way segment."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
-msgid "The angle between the previous and the current way segment."
+msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4420,9 +4418,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(enginn hlutur)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4438,4 +4436,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Þjónustuvegur"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "kínversk"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Skrifstofur"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5143,5 +5156,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr ""
@@ -5224,6 +5237,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5234,5 +5247,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5361,5 +5374,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr ""
@@ -5420,5 +5433,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5577,5 +5590,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5583,5 +5596,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5589,5 +5602,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5595,5 +5608,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5601,5 +5614,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5608,5 +5621,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5614,5 +5627,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5620,5 +5633,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5626,24 +5639,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5723,51 +5736,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Lög"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Sýna lista yfir öll lög."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Sýna eða fela valið lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Sýna/Fela"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Sýna eða fela valið lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Virkja valið lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Sameina þetta lag öðru lagi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Færa valið lag upp í röðinni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Færa valið lag niður í röðinni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Upplýsingar um lag"
@@ -5777,5 +5790,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Vensl"
@@ -6930,6 +6943,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6977,107 +6991,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Heiti"
@@ -7415,5 +7429,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7500,5 +7514,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<mismunandi>"
@@ -8232,5 +8246,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8303,8 +8317,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Gerð"
@@ -8333,6 +8347,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "óskilgreint"
@@ -8653,5 +8667,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr ""
@@ -8710,14 +8724,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Breytingarágrip (stutt lýsing á breytingunum sem þú gerðir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+msgid "Enter an upload comment"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9150,5 +9164,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9170,5 +9184,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9176,60 +9190,92 @@
 msgstr "Stillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Tögg fyrir nýtt breytingarsett"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Hlaða upp breytingum"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Hlaða upp þessari breytingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Endurstilla"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Halda áfram"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Ekki sýna þessi skilaboð aftur"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Hætta við að hala upp og halda áfrám að breyta"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9553,115 +9599,23 @@
 msgstr[1] "{0} hlutum verður eytt:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Sérsníða teikningu lína"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Sérsníða liti"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Veldu lit"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Flytja inn hljóð"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Flytja inn myndir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
 #, java-format
 msgid "{0} track"
@@ -9671,23 +9625,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Lýsing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Tímaspan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Lengd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Lengd: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9696,5 +9650,5 @@
 msgstr[1] "{0} leiðir, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9703,10 +9657,10 @@
 msgstr[1] "{0} punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Breyta í gagnalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9714,21 +9668,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9736,10 +9690,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9747,10 +9701,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9758,21 +9712,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9782,9 +9736,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9792,5 +9746,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9798,23 +9752,115 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Sérsníða teikningu lína"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Sérsníða liti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Veldu lit"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Flytja inn hljóð"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Flytja inn myndir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Gagnalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "útgáfa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9823,11 +9869,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9836,36 +9882,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "Tölfræði um {0}:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "API útgáfa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Breyta í GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9873,5 +9919,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9880,5 +9926,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -9886,5 +9932,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -9893,5 +9939,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -9900,5 +9946,5 @@
 msgstr[1] "{0} samanstendur af {1} ferlum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -9907,24 +9953,28 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX skrár (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9933,34 +9983,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -9968,93 +10018,93 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10064,20 +10114,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10086,5 +10136,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10092,21 +10142,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10114,17 +10164,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10133,5 +10183,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10140,56 +10190,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Les {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10198,5 +10244,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10205,10 +10251,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10217,5 +10263,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10311,9 +10357,9 @@
 msgstr "JPEG myndir (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps punktur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10321,5 +10367,5 @@
 msgstr[1] "punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10328,14 +10374,26 @@
 msgstr[1] "{0} samanstendur af {1} punktum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10343,29 +10401,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
@@ -11208,4 +11254,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Aldrei"
@@ -11220,5 +11267,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11321,5 +11368,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11327,5 +11374,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr ""
@@ -11355,5 +11402,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Notandi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Both"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11361,9 +11421,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Teikna línu á milli GPS punkta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11373,9 +11433,9 @@
 "milli þeirra. Stilltu þetta á „-1“ til að teikna allar línur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Hámarkslengd lína fyrir staðværar skrár (í metrum)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11384,25 +11444,25 @@
 "þetta á „-1“ til að teikna allar línur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Hámarkslengt milli punkta (í metrum)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11410,13 +11470,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11424,9 +11484,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11434,46 +11494,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM gögn"
@@ -11828,21 +11896,26 @@
 "Athugið að stundum þarf að endurræsa JOSM til að stillingar taki gildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Vörpun"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Sýna hnit sem"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Vörpun"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Lag ætlað til mælinga"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Kortavörpun"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12385,5 +12458,5 @@
 msgstr "Bæta við nýju taggi"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12392,49 +12465,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Frekari upplýsingar um þessa forstillingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Valfrjáls eigind:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12444,15 +12517,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12462,17 +12535,17 @@
 msgstr[1] "Breyta {0} hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Ekkert er valið!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Val óhæfilegt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Vista forstillingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12490,7 +12563,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Leita: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12499,17 +12571,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Leita að hlutum."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Þysja að vali"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Leita: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12804,5 +12873,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -14239,5 +14308,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14506,5 +14575,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr ""
@@ -14846,41 +14915,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -14897,25 +14966,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -14953,18 +15022,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Byggingar"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15188,8 +15257,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "vatn"
@@ -15250,6 +15319,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr ""
@@ -15715,34 +15784,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Tómt lag"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15751,14 +15820,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -15835,22 +15904,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Opna slóð"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Niðurhala kortagögnum frá OSM þjóninum."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Niðurhalssvæði"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Veldu minnst tvo hnúta til að sameina."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -15865,7 +15930,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Les {0}..."
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -15896,9 +15961,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15908,5 +15973,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -15915,11 +15980,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr ""
@@ -15929,5 +15994,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr ""
@@ -15937,13 +16002,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16182,5 +16247,5 @@
 msgstr ""
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr ""
@@ -16529,8 +16594,6 @@
 msgstr "Opna mæligluggann."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Endurstilla"
@@ -16561,5 +16624,5 @@
 msgstr "Hornið milli tveggja valinna nóða"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Lag ætlað til mælinga"
@@ -16651,5 +16714,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Sýna OpenStreetBugs pöddur"
@@ -16713,13 +16776,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -16831,93 +16894,93 @@
 msgstr ""
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -16959,9 +17022,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17139,20 +17202,24 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "read protocol version"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17161,50 +17228,58 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17212,5 +17287,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Afturkalla"
@@ -17409,41 +17484,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Gagnvirkt kort"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -17742,4 +17817,13 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:288
 msgid "Terrace"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+msgid "Seamark Editor"
 msgstr ""
 
@@ -18427,6 +18511,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18436,9 +18520,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18517,6 +18601,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18524,5 +18608,5 @@
 msgstr "Villur sem fundust við athugun"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Engar villur fundust við athugun"
@@ -18759,32 +18843,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Hnútur endurtekinn í vegi"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Hnútur endurtekinn í vegi"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Hnútur endurtekinn í vegi"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Hnútur endurtekinn í vegi"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Hnútur endurtekinn í vegi"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Hnútur endurtekinn í vegi"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -18821,5 +18899,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Marghyrningur"
@@ -19336,5 +19414,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr ""
@@ -19470,10 +19548,10 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19619,10 +19697,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -19808,28 +19886,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Sjálfvirkt niðurhal"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -19840,65 +19914,69 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Niðurhala sýnilega reiti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Breyta upplausn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Hlaða reiti sem innihalda villur"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Vista WMS lag í skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Hlaða WMS lag úr skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Sjálfvirkt niðurhal"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -19977,5 +20055,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20008,5 +20086,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20027,5 +20105,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "skógur (ræktaður)"
@@ -20044,71 +20122,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "Annars stigs vegur"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Mælingar"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "Leiðsla"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Marghyrningur"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Listaverk"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "Almenningssamgöngur"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Beygjutakmörkun"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "Athugasemd"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Líma"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "vatnsfarvegur"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20382,7 +20450,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Hala niður OSM gögnum..."
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20579,6 +20646,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20587,5 +20659,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20594,5 +20666,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20601,10 +20673,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20613,5 +20685,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20621,5 +20693,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20628,15 +20700,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20645,5 +20717,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20776,5 +20848,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Tilvísun"
@@ -21313,5 +21385,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21324,5 +21396,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "skógur"
@@ -21626,9 +21698,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "já"
@@ -21738,9 +21810,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "nei"
@@ -21999,5 +22071,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "íbúðargata"
@@ -22046,5 +22118,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "þjónustuvegur"
@@ -22079,5 +22151,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "byggingarsvæði"
@@ -22164,5 +22236,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr ""
@@ -22197,5 +22269,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22365,14 +22437,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Rekstraraðili"
@@ -22640,6 +22712,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Hæð (y/s)"
@@ -23087,5 +23159,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
@@ -23491,5 +23563,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Volt"
@@ -23853,31 +23925,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Opnunartími"
@@ -23937,90 +24009,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24133,7 +24205,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Tilvísun"
@@ -24149,5 +24221,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr ""
@@ -24160,6 +24232,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr ""
@@ -24335,5 +24407,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr ""
@@ -24370,6 +24442,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Skýli"
@@ -24377,5 +24449,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Bekkur"
@@ -24494,5 +24566,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr ""
@@ -24653,5 +24725,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Matargerð"
@@ -24659,73 +24731,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "ítölsk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "kínversk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hamborgarar"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "grísk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "þýsk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indversk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "að hætti heimamanna"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "tyrknesk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asísk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "tælensk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexíkósk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japönsk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Skyndibiti"
@@ -24733,17 +24810,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Breyti skyndibitastað"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Kaffihús"
@@ -24751,9 +24828,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Breyti kaffihúsi"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Bar"
@@ -24761,18 +24838,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Breyti bar"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Bjórgarður (þ. Biergarten)"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Breyti bjórgarði (þýska: Biergarten)"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr ""
@@ -24780,9 +24858,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Næturklúbbur"
@@ -24790,24 +24868,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Breyti næturklúbb"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Ferðamennska"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Safn"
@@ -24815,9 +24893,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Breyti safni"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Dýragarður"
@@ -24826,9 +24904,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Breyti dýragarð"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Útsýnisstaður"
@@ -24836,24 +24914,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Breyti útsýnisstað"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Skemmtigarður"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Breyti skemmtigarð"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Listaverk"
@@ -24861,5 +24939,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Breyti listaverki"
@@ -24867,19 +24945,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Upplýsingamiðstöð"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -24917,5 +24995,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24923,28 +25001,28 @@
 msgstr "stræti"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Nánari lýsing"
@@ -24954,5 +25032,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -24960,5 +25038,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr ""
@@ -24966,6 +25044,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr ""
@@ -24973,5 +25051,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -24979,6 +25057,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Skíði"
@@ -24986,5 +25064,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -24992,46 +25070,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Fræðsluskilti"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "sagnfræði"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "náttúran"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "dýralíf"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25039,29 +25124,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Breyti skýli"
@@ -25069,25 +25154,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Eldstæði"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Sögustaðir"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Kastali"
@@ -25096,19 +25181,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Breyti kastala"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Rústir"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Breyti rústum"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Fornleifasvæði"
@@ -25117,9 +25202,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Breyti fornleifasvæði"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Vígvöllur"
@@ -25127,10 +25212,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Breyti vígvelli"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25138,5 +25223,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25144,15 +25229,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -25160,55 +25245,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Breyti minnisvarða"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Frístundir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -25216,35 +25301,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Breyti leikvöll"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Fiskveiðar"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Íþróttir"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Íþróttaleikvangur"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Breyti íþróttaleikvang"
@@ -25258,6 +25343,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "veldu íþrótt:"
@@ -25673,31 +25758,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "íþrótt"
@@ -25707,240 +25792,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "bogfimi"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "ástralskur fótbolti"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "hafnabolti"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "körfubolti"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "klifur"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hokkí"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "skotfimi"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "skautar"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "skíði"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "sund"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "borðtennis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Íþróttamiðstöð"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Breyti íþróttamiðstöð"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golfvöllur"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Breyti golfvelli"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Íþróttir"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr ""
@@ -25982,23 +26067,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "gerð"
@@ -26040,211 +26125,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "völlur"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "íþróttamiðstöð"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "íþróttaleikvangur"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Bogfimi"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Skautar"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Sund"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
@@ -26252,52 +26337,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Breyti skíðasvæði"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Skotfimi"
@@ -26305,204 +26390,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Breyti skotfimi"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Boltaíþróttir"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Hafnabolti"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hokkí"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Borðtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Breyti borðtennis"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Breyti tennis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Mannvirki"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Bygging"
@@ -26510,5 +26595,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Opinber bygging"
@@ -26516,10 +26601,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Breyti opinberri byggingu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -26527,10 +26612,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Breyti ráðhúsi"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Sendiráð"
@@ -26538,10 +26623,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Breyti sendiráði"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -26550,10 +26635,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Breyti dómshúsi"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Fangelsi"
@@ -26562,10 +26647,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Breyti fangelsi"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -26575,10 +26660,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Breyti lögreglustöð"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -26587,10 +26672,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Breyti slökkvistöð"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Pósthús"
@@ -26598,5 +26683,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Breyti pósthúsi"
@@ -26604,15 +26689,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Leikskóli"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Skóli"
@@ -26620,10 +26705,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Breyti skóla"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Háskóli"
@@ -26631,10 +26716,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Breyti háskóla"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Menntaskóli"
@@ -26642,5 +26727,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Breyti menntaskóla"
@@ -26648,5 +26733,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -26655,10 +26740,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Breyti kvikmyndahúsi"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Bókasafn"
@@ -26667,9 +26752,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Breyti bókasafni"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -26677,10 +26762,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Breyti listamiðstöð"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Leikhús"
@@ -26689,10 +26774,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Breyti leikhúsi"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -26702,5 +26787,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Breyti helgistað"
@@ -26709,6 +26794,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr ""
@@ -26717,66 +26802,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr ""
@@ -26785,81 +26870,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Heimilisfang"
@@ -26868,5 +26953,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Breyti heimilisfangi"
@@ -26874,5 +26959,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Húsnúmer"
@@ -26880,25 +26965,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Nafn húss"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Nafn götu"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Nafn bæjar"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Póstnúmer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Landskóði"
@@ -26907,5 +26992,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -26913,61 +26998,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Mannvirki"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Turn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -26975,25 +27060,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Breyti vatnsturni"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Viti"
@@ -27001,10 +27086,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Breyti vita"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Vindmylla"
@@ -27012,10 +27097,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Breyti vindmyllu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -27024,41 +27109,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Breyti leiðslu"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr ""
@@ -27068,10 +27153,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Krani"
@@ -27079,5 +27164,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Breyti krana"
@@ -27085,10 +27170,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr ""
@@ -27096,10 +27181,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Eftirlitsmyndavél"
@@ -27107,23 +27192,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Breyti eftirlitsmyndavél"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Rafall"
@@ -27133,35 +27218,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Breyti rafli"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Orkuver"
@@ -27170,10 +27255,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Breyti orkuveri"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -27182,5 +27267,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Breyti spennustöð"
@@ -27188,10 +27273,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Tilvísunarnúmer línunnar"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -27202,23 +27287,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Breyti háspennustaur"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Raflína"
@@ -27227,78 +27312,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Breyti raflínu"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "Leiðsla"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "tengibraut á hraðbraut"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Salerni"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Athugasemd"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -27307,5 +27390,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Breyti almenningssíma"
@@ -27313,5 +27396,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Mynt"
@@ -27319,5 +27402,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Athugasemd"
@@ -27325,5 +27408,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27331,5 +27414,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Debetkort"
@@ -27337,15 +27420,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -27354,5 +27437,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Breyti endurvinnslustöð"
@@ -27360,35 +27443,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Rafhlöður"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Dósir"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Föt"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Brotajárn"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27396,5 +27479,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27403,31 +27486,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr ""
@@ -27506,39 +27589,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27547,30 +27630,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Hæð"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Gosbrunnur"
@@ -27579,10 +27662,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Breyti gosbrunn"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -27591,10 +27674,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Breyti drykkjarvatni"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -27603,5 +27686,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27609,5 +27692,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Barnalúga"
@@ -27615,15 +27698,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Breyti barnalúgu"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Verslanir"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -27631,10 +27714,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Breyti bílabúð"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -27643,28 +27726,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Breyti hjólabúð"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr ""
@@ -27672,9 +27755,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Sjoppa"
@@ -27682,27 +27765,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Breyti sjoppu"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Ferðaskrifstofa"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Breyti ferðaskrifstofu"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Slátrari"
@@ -27710,9 +27793,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Breyti slátrara"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Bakarí"
@@ -27720,9 +27803,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Breyti bakaríi"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Blómabúð"
@@ -27730,18 +27813,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Breyti blómabúð"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Lífræn búð"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Breyti lífrænni búð"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr ""
@@ -27749,54 +27832,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Vínbúð"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Tölvubúð"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Breyti tölvubúð"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Raftækjabúð"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Breyti raftækjabúð"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hljómtækjaverslun"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Breyti hljómtækjaverslun"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Húsgagnaverslun"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Breyti húsgagnaverslun"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr ""
@@ -27804,9 +27887,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr ""
@@ -27814,9 +27897,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -27824,54 +27907,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Skrifstofuvörur"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Breyti skrifstofuvörum"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Hársnyrtir"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Breyti hársnyrti"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Skóbúð"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Breyti skóbúð"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Dótabúð"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Breyti dótabúð"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Efnalaug"
@@ -27879,9 +27962,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Breyti efnalaug"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Þvottahús"
@@ -27889,9 +27972,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Breyti þvottahúsi"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Útivistarbúð"
@@ -27899,24 +27982,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Breyti útivistarbúð"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Breyti sjóntækjasmið"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Sjálfsali"
@@ -27924,5 +28007,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr ""
@@ -27930,97 +28013,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "dagblöð"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "dót"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Fjármál"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Banki"
@@ -28028,14 +28111,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Breyti banka"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Hraðbanki"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Gjaldeyrisskipti"
@@ -28043,5 +28126,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Breyti gjaldeyrisskiptum"
@@ -28049,15 +28132,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Breyti hraðbanka"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Heilsa"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Læknir"
@@ -28065,18 +28148,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Breyti lækni"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Tannlæknir"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Breyti tannlækni"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Apótek"
@@ -28084,5 +28167,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Apótek"
@@ -28090,9 +28173,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Spítali"
@@ -28100,10 +28183,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Breyti spítala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr ""
@@ -28112,5 +28195,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28119,20 +28202,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28140,5 +28223,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Dýralæknir"
@@ -28147,64 +28230,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Breyti dýralækni"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Landafræði"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Staðir"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Heimsálfa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Breyti landi"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Fylki"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Breyti fylki"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Svæði"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Sýsla"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Breyti sýslu"
@@ -28212,15 +28295,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Borg"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Breyti borg"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Bær"
@@ -28228,10 +28311,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Breyti bæ"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Hverfi"
@@ -28239,25 +28322,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Breyti hverfi"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Þorp"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Smáþorp"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
@@ -28265,5 +28348,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr ""
@@ -28271,10 +28354,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Eyja"
@@ -28282,10 +28365,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Breyti eyju"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -28293,5 +28376,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -28299,5 +28382,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Hellismunni"
@@ -28305,10 +28388,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Breyti hellismunna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Tindur"
@@ -28316,10 +28399,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Breyti tind"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Jökull"
@@ -28327,10 +28410,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Breyti jökli"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Eldfjall"
@@ -28338,70 +28421,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Breyti eldfjalli"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Landamæri"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Breyti landamærum þjóðgarðs"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Landnýting"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Tré"
@@ -28410,15 +28493,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Breyti tré"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Fræðiheiti"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Skógur"
@@ -28427,5 +28510,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Breyti skóg"
@@ -28433,17 +28516,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "barrskógur"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "laufskógur"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "blandaður"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Skógur (ræktaður)"
@@ -28452,14 +28535,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Breyti ræktuðum skóg"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -28467,25 +28550,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr ""
@@ -28493,10 +28576,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr ""
@@ -28504,5 +28587,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr ""
@@ -28510,5 +28593,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr ""
@@ -28517,45 +28600,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28563,25 +28646,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Garður"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -28589,10 +28672,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr ""
@@ -28600,20 +28683,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Almenningsgarður"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr ""
@@ -28621,5 +28704,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -28627,15 +28710,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -28643,9 +28726,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Breyti grafreit"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr ""
@@ -28653,39 +28736,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Breyti kirkjugarðslandnýtingu"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Smásala"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr ""
@@ -28693,15 +28776,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr ""
@@ -28709,50 +28792,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Byggingarsvæði"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -28762,5 +28845,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Breyta marghyrningi"
@@ -28772,5 +28855,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr ""
@@ -28778,5 +28861,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr ""
@@ -28784,5 +28867,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -28793,5 +28876,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -28799,36 +28882,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -28836,5 +28919,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Beygjutakmörkun"
@@ -28843,5 +28926,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Breyti beygjutakmörkun"
@@ -28849,34 +28932,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "vinstri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "hægri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "óleyfilegt að halda beint áfrám"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "óleyfilegt að taka U-beygju"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "aðeins_beint_fram"
@@ -28885,15 +28968,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "af vegi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "gegnum hnút eða veg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "að vegi"
@@ -28901,5 +28984,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr ""
@@ -28908,5 +28991,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr ""
@@ -28914,5 +28997,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr ""
@@ -29020,5 +29103,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29029,17 +29112,17 @@
 msgstr "hjól"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29107,5 +29190,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29115,9 +29198,9 @@
 msgstr "fótgangandi"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr ""
@@ -29131,10 +29214,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr ""
@@ -29142,31 +29225,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr ""
@@ -29175,30 +29258,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29425,5 +29508,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr ""
@@ -30076,4 +30159,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30177,11 +30268,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr ""
@@ -30694,5 +30785,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "bryggja"
@@ -30706,5 +30797,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "leiðsla"
@@ -30848,13 +30939,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "frístundir"
@@ -30868,5 +30959,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "smábátahöfn"
@@ -30962,10 +31053,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr ""
@@ -31067,10 +31158,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -31508,24 +31599,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -31557,6 +31648,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -31617,8 +31708,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr ""
@@ -31971,26 +32062,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr ""
@@ -32062,8 +32153,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hótel"
@@ -32164,9 +32255,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "ferðamennska"
@@ -32254,9 +32345,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr ""
@@ -32269,5 +32360,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr ""
@@ -32281,5 +32372,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr ""
@@ -32301,5 +32392,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr ""
@@ -32313,5 +32404,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr ""
@@ -32334,5 +32425,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "smásala"
@@ -32346,5 +32437,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "iðnaður"
@@ -32358,5 +32449,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr ""
@@ -32370,5 +32461,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr ""
@@ -32382,5 +32473,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr ""
@@ -32437,7 +32528,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr ""
@@ -32451,5 +32542,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr ""
@@ -32462,5 +32553,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "tindur"
@@ -32475,5 +32566,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "jökul"
@@ -32487,5 +32578,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "eldfjall"
@@ -32540,8 +32631,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr ""
@@ -32555,5 +32646,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr ""
@@ -32567,5 +32658,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr ""
@@ -32579,5 +32670,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -32591,5 +32682,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "leðja"
@@ -32603,5 +32694,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "strönd"
@@ -32679,8 +32770,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr ""
@@ -32769,12 +32860,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr ""
@@ -32924,11 +33015,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr ""
@@ -32942,5 +33033,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33296,4 +33387,9 @@
 msgstr ""
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir."
+#~ msgstr[1] "Vegirnir sem þú valdir innihalda ekki hnútana sem þú valdir."
+
 #~ msgid "Incorrect password or username."
 #~ msgstr "Rangt lykilorð eða notandanafn"
@@ -33424,7 +33520,4 @@
 #~ msgid "Command Stack: {0}"
 #~ msgstr "Skipanasaga: {0}"
-
-#~ msgid "Do not show again"
-#~ msgstr "Ekki sýna þessi skilaboð aftur"
 
 #~ msgid "Combine ways with different memberships?"
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 22568)
+++ applications/editors/josm/i18n/po/it.po	(revision 22569)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-22 02:44+0000\n"
-"Last-Translator: berserkhc <Unknown>\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-08-02 08:52+0000\n"
+"Last-Translator: Davide Prade <davalv@alice.it>\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-07-28 09:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -20,5 +20,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -49,14 +49,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -73,9 +72,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -119,6 +118,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -157,5 +156,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -231,5 +230,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -245,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -263,11 +262,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -275,20 +275,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -321,5 +321,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Unisci"
@@ -388,5 +388,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -400,5 +400,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -420,4 +420,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -434,6 +435,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -445,5 +446,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -579,22 +580,22 @@
 msgstr "Scaricamento dei gruppi di modifiche aperti ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Unisci percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Unisce diversi percorsi in uno."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Inverti direzione?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Inverti direzione e unisci"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -604,5 +605,5 @@
 "la direzione di qualcuno?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -612,10 +613,10 @@
 "di nodi)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Unisci {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Selezionare almeno due percorsi da unire."
@@ -662,10 +663,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -808,5 +809,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -872,10 +873,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Esporta in GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Esporta i dati in un file GPX."
@@ -1075,5 +1076,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "Indirizzo URL"
@@ -1513,20 +1514,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1550,5 +1551,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1559,6 +1560,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Errore"
@@ -1585,5 +1586,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1591,5 +1592,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Salva i dati attuali."
@@ -1646,10 +1647,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Salva come..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Salva i dati correnti su un nuovo file."
@@ -1696,5 +1697,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1721,5 +1722,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "No, annulla"
@@ -1788,18 +1789,24 @@
 msgstr[1] "Semplifica percorso (rimuovi {0} nodi)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Dividi percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Divide un percorso al nodo selezionato."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "La selezione attuale non può essere usata per la divisione."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "I nodi selezionati non condividono il medesimo percorso."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1807,5 +1814,5 @@
 msgstr[1] "I nodi selezionati non sono parte di alcun percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1821,20 +1828,10 @@
 "il percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "I nodi selezionati non condividono il medesimo percorso."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Il percorso selezionato non contiene il nodo selezionato."
-msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Seleziona due o più nodi per dividere un percorso circolare."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1844,5 +1841,5 @@
 "seleziona i nodi in mezzo al percorso)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1853,5 +1850,5 @@
 "necessario.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1861,5 +1858,5 @@
 "strade<br>Verificare l''operazione e correggere dove necessario.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2013,5 +2010,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3075,22 +3072,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3237,6 +3234,6 @@
 msgstr "Impossibile risolvere il conflitto irrisolto"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
@@ -3244,20 +3241,20 @@
 "vuota"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Cancella nodo {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Cancella percorso {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Elimina relazione {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3266,5 +3263,5 @@
 msgstr[1] "Elimina {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3273,5 +3270,5 @@
 msgstr[1] "Elimina {0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3280,5 +3277,5 @@
 msgstr[1] "Elimina {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3287,5 +3284,5 @@
 msgstr[1] "Elimina {0} relazioni"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3443,5 +3440,5 @@
 msgstr "Applicare?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3510,29 +3507,33 @@
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
+"Impossibile creare la cartella {0}, il salvataggio automatico sarà "
+"disabilitato"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
-msgstr ""
+msgstr "Impossibile creare il file {0}, sarà utilizzato un altro nome"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n"
+msgstr ""
+"Errore di IO durante la creazione del file, il salvataggio automatico sarà "
+"ignorato: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Elimina il file della vecchia estensione {0}"
+msgstr "Impossibile eliminare il vecchio file di backup {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Errore nella creazione della cartella di cache: {0}"
+msgstr "Errore durante la creazione del backup del livello rimosso: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
-msgstr ""
+msgstr "Impossibile leggere i dati OSM salvati in automatico ({0}) - {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
@@ -3724,45 +3725,48 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
-msgstr "Gradi Decimali"
+msgstr "Gradi decimali"
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Gradi Minuti Secondi"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Coordinate proiettate"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "O"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3772,5 +3776,5 @@
 "incluso"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3952,5 +3956,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "sfondo"
@@ -4098,5 +4102,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Non visualizzare nuovamente (ricorda la scelta)"
@@ -4124,5 +4128,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "ferrovia"
@@ -4144,6 +4148,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4212,5 +4216,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "building"
@@ -4297,5 +4301,5 @@
 msgstr "Oggetto eliminato"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4399,39 +4403,39 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opzioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Mostra questo aiuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Dimensioni e posizione della finestra (secondo lo standard UNIX)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Scarica la zona delimitata dal riquadro di selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Scarica la zona indicata dall''URL (interpretando lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Apre un file (qualunque tipo di file che possa essere aperto con File/Apri)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 "Scarica la zona delimitata dal riquadro di selezione come dati GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4439,33 +4443,33 @@
 "gps grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Seleziona i risultati della ricerca della stringa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Lancia in modalità massimizzata"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Reimposta le preferenze predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Imposta la lingua"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "opzioni fornite come proprietà di sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PERCORSO/DELLA/CARTELLA/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Cambia la cartella per tutte le impostazioni utente"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4479,9 +4483,9 @@
 "allocata (in megabyte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "Esempi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4491,47 +4495,46 @@
 "questo ordine."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 "Assicurarsi di caricare qualche dato se si utilizza il parametro --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inizializzazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Aggiornando plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Installando plugins aggiornati"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Caricamento vecchie estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Impostazioni predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Creazione dell''interfaccia principale"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Caricamento estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+msgstr "Dati OSM non salvati"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Risolvi"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr "Ripristina"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4539,6 +4542,8 @@
 "time. Do you want to restore data?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+"JOSM ha trovato {0} livelli di dati OSM non salvati. Probabilmente JOSM è "
+"stato chiuso inaspettatamente. Si desidera ripristinare i dati?"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4636,33 +4641,33 @@
 msgstr "Riduci"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "scala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "La longitudine geografica del puntatore del mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Il nome dell''oggetto sul puntatore del mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "La latitudine geografica del puntatore del mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "L''angolo tra il segmento di percorso corrente e quello precedente."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Direzione della bussola del segmento che si sta disegnando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Lunghezza del segmento di percorso che si sta disegnando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4673,9 +4678,9 @@
 "mouse.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(nessun oggetto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4691,4 +4696,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Il livello ''{0}'' deve essere contenuto in una lista di livelli"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Numerico"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "cinese"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Commerciale (uffici)"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5460,5 +5480,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "tutti"
@@ -5545,6 +5565,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5555,5 +5575,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5707,5 +5727,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Gruppi di modifiche"
@@ -5773,5 +5793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5940,5 +5960,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5946,5 +5966,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5952,5 +5972,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5958,5 +5978,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5964,5 +5984,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5971,5 +5991,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5977,5 +5997,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5983,5 +6003,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5989,24 +6009,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro attivo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> oggetti nascosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> oggetti disabilitati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6091,51 +6111,51 @@
 msgstr "Chiudi la finestra, ma non creare un nuovo nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Livelli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Apre la lista di tutti i livelli caricati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Elimina i livelli selezionati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Commuta la visibilità del livello selezionato."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Mostra/Nascondi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Commuta la visibilità del livello selezionato."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Attiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Attiva il livello selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Unisci questo livello con un altro livello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Duplica questo livello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Sposta il livello selezionato in su."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Sposta il layer selezionato in giù."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Informazioni sul livello"
@@ -6145,5 +6165,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relazioni"
@@ -7320,6 +7340,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7367,107 +7388,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Nome"
@@ -7860,5 +7881,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7952,5 +7973,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<diverso>"
@@ -8749,5 +8770,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Confini"
@@ -8820,8 +8841,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Tipo"
@@ -8850,6 +8871,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "sconosciuto"
@@ -9219,5 +9240,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Rilevati conflitti"
@@ -9291,14 +9312,15 @@
 "atteso"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Crea un breve commento ai cambiamenti che sta caricando:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Inserire un commento al caricamento (min. 3 caratteri)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Commento non valido"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "Identificativo del gruppo di modifiche:"
@@ -9783,5 +9805,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Carica"
@@ -9803,5 +9825,5 @@
 msgstr "Inizializzazione delle relazioni da aggiornare ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9809,18 +9831,18 @@
 msgstr "Impostazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "Decidere come caricare i dati e quale insieme di modifiche utilizzare"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Etichette del nuovo insieme di modifiche"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Applica le etichette ai dati dell''insieme di modifiche caricato"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
@@ -9828,44 +9850,77 @@
 "quale caricare"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Configura le impostazioni avanzate"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Caricamento su ''''{0}''''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Carica le modifiche"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Carica le primitive modificate"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-"Inserire un commento per questo insieme di modifiche (min. 3 caratteri)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Commento non valido"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Inverti"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Continua"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Annulla e ritorna all''editor"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Non mostrare nuovamente"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Si prega di inserire prima una dimensione del raggruppamento valida"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Dimensione del raggruppamento non valida"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Annulla il caricamento e ritorna alle modifiche"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -10247,109 +10302,11 @@
 msgstr[1] "{0} oggetti da eliminare:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Personalizza disegno linee"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Usa le impostazioni globali."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Disegna le linee tra i punti di questo livello."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Non disegnare le linee tra i punti di questo livello."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Seleziona le opzioni per il disegno delle linee"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Personalizza colori"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predefinito"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Scegli un colore"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Crea marcatori dai punti con nome"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Nomina i punti del percorso da {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Importa l''audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>Sono stati scaricati dal server i dati nel livello GPX ''''{0}''''."
-"<br>Siccome i suoi punti non includono una marcatura temporale non è "
-"possibile correlarli con la traccia audio.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Importazione non possibile"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Files audio Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcatori audio da {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importa immagini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html>Sono stati scaricati dal server i dati nel livello GPX ''''{0}''''."
-"<br>Siccome i suoi punti non includono una marcatura temporale non è "
-"possibile correlarli con le immagini.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10357,5 +10314,5 @@
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10363,5 +10320,5 @@
 msgstr "Descrizione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10371,23 +10328,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Differenza temporale"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Lunghezza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Lunghezza: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10396,5 +10353,5 @@
 msgstr[1] "{0} itinerari, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10403,10 +10360,10 @@
 msgstr[1] "{0} punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Converti in livello dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10417,21 +10374,21 @@
 "tracciati, vedere qui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertito da: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10439,10 +10396,10 @@
 msgstr "Scarica da OSM lungo questo tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Scarica tutto entro:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10450,10 +10407,10 @@
 msgstr "{0} metri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Area massima per richiesta:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10461,21 +10418,21 @@
 msgstr "{0} km quadrati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr "Scarica vicino:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr "solo tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr "solo punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr "tracciato e punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10487,9 +10444,9 @@
 "vuole procedere?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Nessuna traccia GPX da associare con l''audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10500,5 +10457,5 @@
 "all''inizio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10508,19 +10465,117 @@
 "tracciato per poter essere giustamente calcolati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Personalizza disegno linee"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Usa le impostazioni globali."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Disegna le linee tra i punti di questo livello."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Non disegnare le linee tra i punti di questo livello."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Seleziona le opzioni per il disegno delle linee"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Personalizza colori"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predefinito"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Scegli un colore"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Crea marcatori dai punti con nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Nomina i punti del percorso da {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Importa l''audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>Sono stati scaricati dal server i dati nel livello GPX ''''{0}''''."
+"<br>Siccome i suoi punti non includono una marcatura temporale non è "
+"possibile correlarli con la traccia audio.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Importazione non possibile"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Files audio Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcatori audio da {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importa immagini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>Sono stati scaricati dal server i dati nel livello GPX ''''{0}''''."
+"<br>Siccome i suoi punti non includono una marcatura temporale non è "
+"possibile correlarli con le immagini.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Livello dati {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "al di fuori dell''area scaricata"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "versione {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
@@ -10528,5 +10583,5 @@
 "nella versione 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10535,11 +10590,11 @@
 msgstr[1] "Sono stati individuati {0} conflitti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Cliccare per chiudere questa finestra e continuare a modificare"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10548,36 +10603,36 @@
 msgstr[1] "{0} eliminati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} è composto da:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "disattiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "Versione delle API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Converti in un layer GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Controllo consistenza dell'insieme dei dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "Nessun problema trovato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Sono stati trovati i seguenti problemi:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10588,5 +10643,5 @@
 "vedere qui:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10595,5 +10650,5 @@
 msgstr[1] "tracciati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10601,5 +10656,5 @@
 msgstr[1] "punti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10608,5 +10663,5 @@
 msgstr[1] "una traccia con {0} punti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10615,5 +10670,5 @@
 msgstr[1] "{0} è composto da {1} tracce"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10622,24 +10677,28 @@
 msgstr[1] "{0} punti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Correlazione ai dati GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "File GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Il file {0} è stato caricato già sotto il nome \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Impossibile interpretare {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Impossibile leggere \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10651,34 +10710,34 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Ora di scatto della fotografia (dai dati exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Ora GPS (letto dalla fotografia precedente): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [gg/mm/aaaa hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Mi trovo nel fuso orario di: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Nessuna data"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Apri un''altra fotografia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Sincronizza l''ora da una fotografia del ricevitore GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10688,21 +10747,21 @@
 "Si prega di usare il formato richiesto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Data non valida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Nessun tracciato GPX ancora caricato>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "Tracciato GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Apri un altro tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10711,72 +10770,72 @@
 "del ricevitore GPS</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Auto-determina"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr "Correla la prima foto con il primo punto gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Regolazione manuale"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "Sovrapposizione per: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Immagini con georeferenziazione nei dati exif ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Immagini che sono state già etichettate ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Visualizza le miniature delle immagini sulla mappa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Fuso orario: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Scostamento:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Correla le immagini al tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Correla"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Fuso orario non valido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Compensazione non valida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Riprova"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "Non è stato possibile correlare alcuna immagine!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "Nessun tracciato gpx selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10788,20 +10847,20 @@
 "<html>Correlate <b>{0}</b> di <b>{1}</b> foto al tracciato GPX.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Fuso orario: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuti: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Secondi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10810,5 +10869,5 @@
 msgstr[1] "Differenza temporale di {0} giorni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10819,21 +10878,21 @@
 "manualmente le foto."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "E'' fallita la correlazione delle foto al tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Regola fuso orario e differenza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "Le foto selezionate non contengono informazioni sull''ora."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Le foto non contengono informazioni sull''ora"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10843,17 +10902,17 @@
 "Selezionarne un altro."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "Il tracciato GPX non contiene alcuna informazione sull''ora"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Selezionare un tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Nessun tracciato GPX selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10864,5 +10923,5 @@
 "Formato atteso: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10873,56 +10932,52 @@
 "Formato atteso: {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Estrazione delle localizzazioni GPS dagli EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Inizio analisi cartella"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "Uno dei file selezionati era nullo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Lettura delle foto ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lettura di {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Non è possibile ottenere il percorso canonico per la cartella {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Analisi cartella {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Trovato un file nullo nella cartella {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Immagini georeferenziate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Correlazione ai dati GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10931,5 +10986,5 @@
 msgstr[1] "{0} immagini caricate."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10938,10 +10993,10 @@
 msgstr[1] "Trovate {0} contenti informazioni GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Elimina il file immagine dal disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10952,5 +11007,5 @@
 "definitivamente perduto!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "Il file dell''immagine non può essere eliminato."
@@ -11052,9 +11107,9 @@
 msgstr "Immagini JPEG (*.jpeg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "segnaposto gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -11062,5 +11117,5 @@
 msgstr[1] "marcatori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -11069,14 +11124,26 @@
 msgstr[1] "{0} è composto da {1} marcatori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Non ci sono marcatori audio in questo layer da compensare."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "Mostra Testo/Icone"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Commuta la visualizzazione dei marcatori di testo ed icone"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Sincronizza l''audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Premi pausa quando senti il segnale di sincronizzazione."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -11084,30 +11151,18 @@
 msgstr "Audio sincronizzato al punto {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Impossibile sincronizzare nel layer in esecuzione."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Crea marcatore audio in prossimità della testina di riproduzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr "Premi pausa nel punto del tracciato dove vuoi il marcatore"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Non ci sono marcatori audio in questo layer da compensare."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr "Mostra Testo/Icone"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Commuta la visualizzazione dei marcatori di testo ed icone"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -12097,4 +12152,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Nessuno"
@@ -12109,5 +12165,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "Disegna un cerchio in base al valore HDOP."
@@ -12211,5 +12267,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -12219,5 +12275,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Solo sull''estremità di un percorso."
@@ -12247,5 +12303,20 @@
 msgstr "Crea marcatori durante la lettura del tracciato GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Autore"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Diesel"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Barca"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12255,9 +12326,9 @@
 "per ogni punto del percorso."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Disegna le linee tra i punti GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12267,9 +12338,9 @@
 "Usare ''-1'' per disegnare qualsiasi linea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Lunghezza massima per i file locali (metri)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12278,10 +12349,10 @@
 "permettere qualsiasi lunghezza."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Lunghezza massima (metri)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12290,5 +12361,5 @@
 "sulle linee."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
@@ -12296,5 +12367,5 @@
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12303,5 +12374,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12309,13 +12380,13 @@
 msgstr "Non disegnare le frecce se non sono distanti dalla precedente almeno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Distanza minima (in pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Disegna dei cerchi più grandi per i punti GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12325,9 +12396,9 @@
 "personalizzato nel Gestore dei Livelli."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Colora i punti e i segmenti del tracciato in base alla velocità."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12338,5 +12409,5 @@
 "registrare queste informazioni."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12344,18 +12415,27 @@
 "velocità medie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Colorazione del tracciato e del punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "Descrizione del punto del percorso"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "Punti GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Disegna il verso sui segmenti dei percorsi."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
@@ -12364,5 +12444,5 @@
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -12370,10 +12450,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Disegna i confini dei dati scaricati dal server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12382,9 +12462,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Disegna con un colore diverso i layer non attivi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Dati OSM"
@@ -12777,21 +12857,26 @@
 "È necessario riavviare JOSM perché alcune impostazioni abbiano effetto."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Metodo di proiezione"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Codice proiezione"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Visualizza le coordinate come"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Metodo di proiezione"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Codice proiezione"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Livello in cui fare le misurazioni"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Proiezione della mappa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -13415,5 +13500,5 @@
 msgstr "Aggiungi una nuova etichetta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -13424,49 +13509,49 @@
 "display_values deve essere lo stesso di values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Ulteriori informazioni su questa caratteristica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Requisito sconosciuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "Ruoli disponibili"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr "ruolo"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr "conteggio"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr "elementi"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Attributi opzionali:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo sconosciuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr "Elemento ruolo preimpostato senza genitori"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr "Sotto-elemento preimpostato senza genitori"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13476,15 +13561,15 @@
 msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Impossibile leggere {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Sono supportati elementi di tipo {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13494,17 +13579,17 @@
 msgstr[1] "Modifica {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Non è stato selezionato niente!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Selezione non adatta!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Applica preimpostazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13522,26 +13607,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Cerca: "
+msgstr "Ricerca preimpostazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Show preset search dialog"
-msgstr ""
+msgstr "Visualizza la finestra di ricerca delle preimpostazioni"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Cerca oggetti"
+msgstr "Ricerca preimpostazioni"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Visualizza il nome localizzato nelle liste di selezione"
+msgstr "Visualizza solamente per la selezione"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Cerca: "
+msgstr "Cerca nelle etichette"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13873,5 +13954,5 @@
 msgstr "Analisi del file \"{0}\" fallita"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -15540,5 +15621,5 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15843,5 +15924,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -16283,41 +16364,41 @@
 msgstr "Non mostrare nuovamente"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "Costruzione indirizzo"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "Numero civico:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Nome della strada:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Incrementa"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Decrementa"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Numeri:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr "Modalità grandi edifici"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr "Ruota mirino"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr "Impostazioni avanzate"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr "Tag edifici"
@@ -16334,25 +16415,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Imposta dimensione degli edifici"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "Usa la finestra Indirizzo"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr "Selezione Automatica Edifici"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Larghezza edifici:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr "Passo di lunghezza:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr "Avanzate..."
@@ -16390,18 +16471,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Edifici"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr "Prossimo numero"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Strada"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr "Inserisci indirizzo"
@@ -16579,7 +16660,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
-#, fuzzy
 msgid "Use \"Tableau d''assemblage\""
-msgstr "Selezionare la tabella di assemblaggio"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -16645,8 +16725,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "acqua"
@@ -16707,6 +16787,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "indirizzo"
@@ -17216,34 +17296,34 @@
 "Selezionare prima uno di questi, e poi riprovare"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Livello vuoto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Layer WMS ({0}), {1} tasselli caricati"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Non è vettorializzato"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Dimensioni raster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "E'' stato vettorializzato"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Riquadro del comune: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -17254,9 +17334,9 @@
 "Crearne uno nuovo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Errore nel formato della cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -17265,5 +17345,5 @@
 "Lambert {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 msgid "Cache Lambert Zone Error"
 msgstr "Errore nella zona di Lambert della cache"
@@ -17343,37 +17423,33 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Scarica oggetto..."
+msgstr "Scarica lungo..."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Scarica i dati della mappa alla fine del percorso selezionato"
+msgstr "Scarica i dati OSM lungo i percorsi selezionati."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Scarica adesso"
+msgstr "Scarica Lungo"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Selezionare almeno un compito per scaricare"
+msgstr "Selezionare 1 o più percorsi"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
 #, java-format
 msgid "{0} intermediate nodes to download."
-msgstr ""
+msgstr "Da scaricare {0} nodi intermedi."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Controllo {0}/{1}: Inizio {2}"
+msgstr "tra {0} {1} e {2} {3}"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Errore nella interpretazione di {0}: {1}"
+msgstr "  aggiungendo {0} {1}"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -17404,9 +17480,9 @@
 msgstr "Crea un percorso duplicato"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Livello per la modifica dei tracciati GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Converti in livello GPX con orario anonimo"
@@ -17416,5 +17492,5 @@
 msgstr "ModificaGpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "modifica tracciati gpx"
@@ -17423,11 +17499,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Importa percorso da un livello GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Elimina percorso esistente"
@@ -17437,5 +17513,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Non è stato trovato alcun livello dei dati GPX."
@@ -17445,13 +17521,13 @@
 msgstr "Lo script figlio riporta dati non validi"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr "Strumenti di modifica"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr "Linea di comando"
@@ -17693,5 +17769,5 @@
 msgstr "Visualizza le foto non georeferenziate"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Immagini importate"
@@ -18057,8 +18133,6 @@
 msgstr "Apri la finestra delle misurazioni"
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Azzera"
@@ -18091,5 +18165,5 @@
 msgstr "Angolo compreso tra due nodi selezionati"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Livello in cui fare le misurazioni"
@@ -18185,5 +18259,5 @@
 msgstr "Ciclo di scaricamento di OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Visualizza segnalazioni OpenStreetBugs"
@@ -18257,13 +18331,13 @@
 msgstr "Coda"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "non in linea"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "in linea"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -18381,13 +18455,17 @@
 msgstr "Eseguibile di Firefox"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "Errore di lettura!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "Errore di scrittura!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "Scrivi le coordinate nell''intestazione dell''immagine"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
@@ -18395,84 +18473,80 @@
 "file:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "impostazioni"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "mantieni i file di backup"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "cambia l''ora di modifica del file:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "con l'ora del gps"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "con il valore precedente (mtime invariato)"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr "Estensione per la georeferenziazione delle foto"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 "Scrittura delle informazioni relative alla posizione sui file immagine..."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "Impossibile leggere mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "Impossibile scrivere mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "Il file non può essere eliminato!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "Impossibile rinominare il file!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 "<html><h3>Ci sono vecchi file di backup nella cartella delle immagini!</h3>"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "Sostituire i vecchi file di backup?"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "Mantieni i vecchi backup e continua"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "Sostituisci"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "Impossibile eliminare il file temporaneo!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "Test fallito: impossibile leggere mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "Test fallito: impossibile scrivere mtime."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "Scrivi le coordinate nell''intestazione dell''immagine"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -18495,5 +18569,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
 msgid "PicLayer move"
-msgstr "Spostamento PicLayer"
+msgstr "Spostamento livello immagine"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
@@ -18513,9 +18587,9 @@
 msgstr "Nuovo livello immagine da file..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "Immagine non creata correttamente."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "Impossibile trovare l''oggetto della mappa."
@@ -18531,5 +18605,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
 msgid "PicLayer"
-msgstr "PicLayer"
+msgstr "Livello immagine"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -18559,5 +18633,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
 msgid "PicLayer rotate"
-msgstr "Rotazione PicLayer"
+msgstr "Rotazione livello immagine"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
@@ -18575,5 +18649,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:81
 msgid "JOSM PicLayer plugin calibration data"
-msgstr "Estensione JOSM PicLayer per i dati di calibrazione"
+msgstr "Dati di calibrazione dell''estensione JOSM PicLayer"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:85
@@ -18584,5 +18658,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
 msgid "PicLayer scale X"
-msgstr "Ridimensionamento X PicLayer"
+msgstr "Ridimensionamento X livello immagine"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
@@ -18592,5 +18666,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
 msgid "PicLayer scale"
-msgstr "Ridimensionamento PicLayer"
+msgstr "Ridimensionamento livello immagine"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
@@ -18600,5 +18674,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
 msgid "PicLayer scale Y"
-msgstr "Ridimensionamento Y PicLayer"
+msgstr "Ridimensionamento Y livello immagine"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
@@ -18693,8 +18767,13 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "versione risolta:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "conferma manualmente tutte le azioni di controllo remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
@@ -18702,13 +18781,13 @@
 "applicazioni."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Controllo remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Preferenze per l''estensione di controllo remoto."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18720,34 +18799,36 @@
 "applicazioni esterne che devono dialogare con l''estensione."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Azioni permesse"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Il controllo remoto ha richiesto il caricamento dei dati dalle API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Dettagli della richiesta: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Si vuole permettere questo?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Conferma l''azione del controllo remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr "il controllo remoto ha richiesto la creazione di un nuovo nodo."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -18755,17 +18836,23 @@
 "indirizzo URL:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr "Ripristinare completamente il changeset"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr "Ripristinare solo la selezione"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr "Ripristinare la selezione e gli oggetti cancellati"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -18773,5 +18860,5 @@
 msgstr "Ripristina gruppo di modifiche"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Ripristina"
@@ -18975,41 +19062,41 @@
 msgstr "Elimina i nodi non necessari di un'area"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Ingrandimento automatico"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Carica il tassello"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "Mostra informazioni sul tassello"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Carica tutti i tasselli"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Aumenta l''ingrandimento"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Diminuisci l''ingrandimento"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "Blocca alla dimensione del tassello"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Svuota la cache dei tasselli"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "immagine "
@@ -19317,4 +19404,14 @@
 msgid "Terrace"
 msgstr "Complesso"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Separatore"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -20093,6 +20190,6 @@
 msgstr "Aggiungi l''etichetta mancante {0}={1}"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -20106,9 +20203,9 @@
 "\">{3}</span>."
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr "Dividi ora"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr "Divide il percorso"
@@ -20191,6 +20288,6 @@
 msgstr "Trovati {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -20198,5 +20295,5 @@
 msgstr "Errori di verifica"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Nessun errore individuato"
@@ -20443,32 +20540,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Fondere il nodo duplicato?"
+msgstr "Nodi duplicati di tipo misto"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Nodi duplicati"
+msgstr "Nodi stradali duplicati"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Nodi duplicati"
+msgstr "Nodi ferroviari duplicati"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Fondere il nodo duplicato?"
+msgstr "Nodi nautici duplicati"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Nodi duplicati"
+msgstr "Nodi di confine duplicati"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Fondere il nodo duplicato?"
+msgstr "Nodi di rete elettrica duplicati"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -20507,5 +20598,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -21057,5 +21148,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "area"
@@ -21198,10 +21289,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr "Visualizza la posizione corrente nel video"
@@ -21352,10 +21443,10 @@
 "Impossibile leggere le informazioni dell''id \"{0}\" da walking-papers.org"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -21562,9 +21653,5 @@
 "Potrebbero essere presenti errori nelle coordinate."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Scaricamento automatico"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21573,9 +21660,9 @@
 "non corretto ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(disattivato)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
@@ -21583,10 +21670,10 @@
 "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, 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:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -21602,17 +21689,17 @@
 "WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Si, preleva le immagini"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "Indirizzo URL non valido?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Scarica i tasselli visibili"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21621,48 +21708,52 @@
 "visuale, oppure di cambiare la risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Ricarica i tasselli non corretti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Salva il livello WMS su file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Salva livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Carica il livello WMS da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Carica livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Errore nel formato del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Errore durante il caricamento del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Imposta segnalibro WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Scaricamento automatico"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -21686,5 +21777,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79
 msgid "Menu Name"
-msgstr "Nome del Menu"
+msgstr "Nome del menu"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
@@ -21742,5 +21833,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -21778,5 +21869,5 @@
 msgstr "Periferica  Audio Non Disponibile"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -21799,5 +21890,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "foresta"
@@ -21810,78 +21901,67 @@
 #. relation type
 #: build/specialmessages.java:17
-#, fuzzy
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr "crea una relazione associatedStreet"
+msgstr "strada associata (associatedStreet)"
 
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "confine"
+msgstr "confine (boundary)"
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Incrementa"
+msgstr "controllo (enforcement)"
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "linea"
+msgstr "linea (line)"
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "multipoligono"
+msgstr "multipoligono (multipolygon)"
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Rete"
+msgstr "rete (network)"
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "trasporto pubblico"
+msgstr "trasporto pubblico (public_transport)"
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Divieto"
+msgstr "divieto (restriction)"
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "itinerario"
+msgstr "itinerario (route)"
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "luogo"
+msgstr "sito (site)"
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "corso d''acqua"
+msgstr "corso d''acqua (waterway)"
 
 #. Strings in JFileChooser
@@ -22170,7 +22250,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Scarica da OSM lungo questo tracciato"
+msgstr "Scarica i dati OSM lungo un percorso"
 
 #. Plugin Duplicate-Way
@@ -22411,6 +22490,11 @@
 msgstr "Costruisce un complesso di edifici a partire da singoli blocchi."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22422,5 +22506,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22431,5 +22515,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22440,10 +22524,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr "Permette di ripristinare un oggetto dal database di OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22455,5 +22539,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22466,5 +22550,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22476,5 +22560,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -22482,10 +22566,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 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:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22496,5 +22580,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22629,5 +22713,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Riferimento"
@@ -23166,5 +23250,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "metallo"
@@ -23177,5 +23261,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "bosco"
@@ -23479,9 +23563,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "si"
@@ -23591,9 +23675,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "no"
@@ -23852,5 +23936,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "residenziale"
@@ -23899,5 +23983,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "strada di servizio"
@@ -23932,5 +24016,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "construction"
@@ -24017,5 +24101,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "escursionismo"
@@ -24050,5 +24134,5 @@
 msgstr "buona"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "intermedio"
@@ -24119,5 +24203,5 @@
 #: build/trans_presets.java:547
 msgid "Segregated Foot- and Cycleway"
-msgstr "Pista pedonale separata- e ciclabile"
+msgstr "Pista pedonale separata e ciclabile"
 
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
@@ -24125,5 +24209,5 @@
 #: build/trans_presets.java:569
 msgid "Combined Foot- and Cycleway"
-msgstr "Pista combinata pedonale- e ciclabile"
+msgstr "Pista combinata pedonale e ciclabile"
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
@@ -24218,14 +24302,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operatore"
@@ -24418,5 +24502,5 @@
 #: build/trans_presets.java:697
 msgid "City Limit"
-msgstr "City Limit"
+msgstr "Cartello di inizio/fine di centro abitato"
 
 #. item "Waypoints/City Limit"
@@ -24424,5 +24508,5 @@
 #: build/trans_presets.java:699
 msgid "Edit City Limit Sign"
-msgstr "Modifica City Limit"
+msgstr "Modifica cartello di inizio/fine di centro abitato"
 
 #. item "Waypoints/City Limit" text "Name"
@@ -24434,5 +24518,5 @@
 #: build/trans_presets.java:706
 msgid "Speed Camera"
-msgstr "Speed Camera"
+msgstr "Rilevatore di velocità"
 
 #. item "Waypoints/Speed Camera"
@@ -24493,6 +24577,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Elevazione"
@@ -24940,5 +25024,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "palude alluvionale"
@@ -25063,5 +25147,5 @@
 #: build/trans_presets.java:1105
 msgid "Waterway Point"
-msgstr "Punto di corso d''acqua"
+msgstr "Nautica"
 
 #. group "Waterway Point"
@@ -25344,5 +25428,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Tensione"
@@ -25706,31 +25790,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Orario di apertura"
@@ -25790,90 +25874,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Ve 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
@@ -25986,7 +26070,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Numero di riferimento"
@@ -26002,5 +26086,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "sotterraneo"
@@ -26013,6 +26097,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Tariffa"
@@ -26188,5 +26272,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Sedia a rotelle"
@@ -26223,6 +26307,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Pensilina/ricovero"
@@ -26230,5 +26314,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Panchina"
@@ -26347,5 +26431,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Torre radio"
@@ -26506,5 +26590,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Cucina"
@@ -26512,73 +26596,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "cinese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "greca"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "tedesca"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "provinciale"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asiatica"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "tailandese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "messicana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "giapponese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "francese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "tramezzino"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Fast food"
@@ -26586,17 +26675,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifica fast food"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "fish-and-chips"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "pollo"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Caffetteria"
@@ -26604,9 +26693,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Caffetteria"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub"
@@ -26614,18 +26703,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Modifica Pub"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Modifica Biergarten"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar"
@@ -26633,9 +26723,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Modifica Bar"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Club notturno"
@@ -26643,24 +26733,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Modifica club notturno"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museo"
@@ -26668,9 +26758,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Modifica museo"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -26679,9 +26769,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Modifica zoo"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Punto panoramico"
@@ -26689,24 +26779,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Modifica punto panoramico"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Torre di avvistamento"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Parco divertimenti"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Modifica parco divertimenti"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Opera d''arte"
@@ -26714,5 +26804,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Modifica opera d''arte"
@@ -26720,19 +26810,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Ufficio informazioni"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Mappa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Grado di dettaglio"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "topografico"
@@ -26770,5 +26860,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26776,28 +26866,28 @@
 msgstr "strada"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "schema"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Area visualizzata"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "luogo"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "città"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "provincia"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Descrizione più specifica"
@@ -26807,5 +26897,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Itinerari segnalati per:"
@@ -26813,5 +26903,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Percorso escursionistico"
@@ -26819,6 +26909,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -26826,5 +26916,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Mountain bike"
@@ -26832,6 +26922,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Sci"
@@ -26839,5 +26929,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Equitazione"
@@ -26845,46 +26935,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "... altre modalità di trasporto possibili"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Tabellone informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Contenuto del cartello"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "avviso"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "storia"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "fauna"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "piantine"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Indicatore stradale"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "palo"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Terminale informazioni"
@@ -26892,29 +26990,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Descrizione dettagliata"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Audio-guida"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Audio-guida tramite cellulare?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Numero di telefono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Modifica pensilina/ricovero"
@@ -26922,25 +27020,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Caminetto"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Area picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Modifica area picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Castello"
@@ -26949,19 +27047,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Modifica castello"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Rovine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
@@ -26970,9 +27068,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Modifica sito archeologico"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Campo di battaglia"
@@ -26980,10 +27078,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Modifica campo di battaglia"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Sito paleontologico"
@@ -26991,5 +27089,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Modifica sito paleontologico"
@@ -26997,15 +27095,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Memoriale"
@@ -27013,55 +27111,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Modifica memoriale"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Pietra limite"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Modifica pietra limite"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Svago"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Parco giochi"
@@ -27069,35 +27167,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Modifica parco giochi"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -27111,6 +27209,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "seleziona uno sport:"
@@ -27526,31 +27624,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "sport"
@@ -27560,240 +27658,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "polivalente"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "tiro con l''arco"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "atletica"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr "football americano"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "football_australiano"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "pallacanestro"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "boccie"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr "calcio canadese"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "canoa"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "arrampicata"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "reti_cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "cinodromo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "sport equestri"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr "calcio gaelico"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "ginnastica"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "ippodromo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "autodromo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "racchette"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr "rugby a 13"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr "rugby a 15"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "poligono_di_tiro"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "pattinaggio"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "comprensorio_sciistico"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "calcio"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "piscina"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "ping_pong"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Discipline sportive"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
@@ -27835,23 +27933,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "tipo"
@@ -27893,211 +27991,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "campo sportivo"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "centro sportivo"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadio"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "tracciato"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Tiro con l''arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Modifica tiro con l''arco"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Sport motoristici"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Modifica Sport Motoristici"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
@@ -28105,52 +28203,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Modificare Sci"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -28158,204 +28256,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Modifica poligono di tiro"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Discipline sportive (palla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr "Football americano"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr "Modifica football americano"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr "Calcio canadese"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr "Modifica calcio canadese"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr "Calcio gaelico"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr "Modifica calcio gaelico"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr "Rugby a 13 (rugby league)"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr "Modifica rugby a 13 (rugby league)"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr "Rugby a 15 (rugby union)"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr "Modifica rugby a 15 (rugby union)"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Modifica Tennis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Artificiale"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Palazzo"
@@ -28363,5 +28461,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Edificio pubblico"
@@ -28369,10 +28467,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Modifica edificio pubblico"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Municipio"
@@ -28380,10 +28478,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Modifica municipio"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -28391,10 +28489,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Modifica ambasciata"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -28403,10 +28501,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Modifica Palazzio del tribunale"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Prigione"
@@ -28415,10 +28513,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Modifica Prigione"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Polizia"
@@ -28428,10 +28526,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Modifica Polizia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -28440,10 +28538,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Modifica vigili del fuoco"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -28451,5 +28549,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Modifica Ufficio Postale"
@@ -28457,15 +28555,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Modifica asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Scuola"
@@ -28473,10 +28571,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Modifica scuola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Università"
@@ -28484,10 +28582,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Modifica Università"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Scuola superiore"
@@ -28495,5 +28593,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Modifica scuola superiore"
@@ -28501,5 +28599,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Cinema"
@@ -28508,10 +28606,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Modifica Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Biblioteca"
@@ -28520,9 +28618,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Modifica biblioteca"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -28530,10 +28628,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Modifica centro d''arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Teatro"
@@ -28542,10 +28640,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Modifica Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -28555,5 +28653,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Modifica Luogo di culto"
@@ -28562,6 +28660,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religione"
@@ -28570,66 +28668,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "Bahaista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "Buddista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "Cristiana"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "Induista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "Giainista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "Ebraica"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "Mussulmana"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "Spiritualista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "Taoista"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "Unitariana"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "Zoroastrista"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Denominazione"
@@ -28638,81 +28736,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "Anglicana"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "Battista"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "Cattolica"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "Evangelica"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "Testimoni di Geova"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "Luterana"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "Metodista"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "Mormone"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "Ortodossa"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "Pentecostale"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "Prebiteriana"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "Protestante"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "Quacchera"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "Sciita"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "Sunnita"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Indirizzi"
@@ -28721,5 +28819,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Modifica dati indirizzo"
@@ -28727,5 +28825,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Numero civico"
@@ -28733,25 +28831,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Nome Casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Nome Strada"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Nome città"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Codice postale"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Codice nazione"
@@ -28760,5 +28858,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Modifica interpolazione indirizzo"
@@ -28766,61 +28864,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "dispari"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "pari"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alfabetico"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Artificiale"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Tipo di torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "telecomunicazioni"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "osservazione"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Altezza (metri)"
@@ -28828,25 +28926,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Faro"
@@ -28854,10 +28952,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Modifica faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -28865,10 +28963,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Modifica mulino a vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -28877,41 +28975,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Modifica conduttura"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "calore"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "petrolio"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "liquami"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "qualunque sostanza"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Posizione"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "subacqueo"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "sopra il suolo"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -28921,10 +29019,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Modifica depuratore acqua"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Gru permanente"
@@ -28932,5 +29030,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Modifica gru permanente"
@@ -28938,10 +29036,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Modifica torre radio"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -28949,10 +29047,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -28960,23 +29058,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Modifica telecamera di sorveglianza"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "interno"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "esterno"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "pubblico"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -28986,35 +29084,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Modifica centrale elettrica"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -29023,10 +29121,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Modifica stazione elettrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -29035,5 +29133,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Modifica sottostazione elettrica"
@@ -29041,10 +29139,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
-msgstr "Riferimento linea"
+msgstr "Riferimento elettrodotto"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -29055,103 +29153,101 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Modifica pilone (elettricità)"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "traliccio"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "palo"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Riferimento torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
-msgstr "Linea elettrica"
+msgstr "Elettrodotto"
 
 #. item "Man Made/Power Line"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
-msgstr "Modifica linea elettrica"
+msgstr "Modifica elettrodotto"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Tipo di linea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "linea"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr "elettrodotto"
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "linea minore"
+msgstr "elettrodotto secondario"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Quantità di cavi"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Numero di fili (conduttori) per cavo elettrico"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
-msgstr "singola"
-
-#: build/trans_presets.java:2458
+msgstr "singolo"
+
+#: build/trans_presets.java:2464
 msgid "double"
-msgstr "doppia"
-
-#: build/trans_presets.java:2458
+msgstr "doppio"
+
+#: build/trans_presets.java:2464
 msgid "triple"
-msgstr "tripla"
-
-#: build/trans_presets.java:2458
+msgstr "triplo"
+
+#: build/trans_presets.java:2464
 msgid "quad"
-msgstr "quadrupla"
-
-#: build/trans_presets.java:2461
+msgstr "quadruplo"
+
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Servizi"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Bagni pubblici"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "limitato"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefono"
@@ -29160,5 +29256,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Modifica Telefono"
@@ -29166,5 +29262,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Monete"
@@ -29172,5 +29268,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Note"
@@ -29178,5 +29274,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Portafogli elettronici e carte di debito"
@@ -29184,5 +29280,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Carte di debito"
@@ -29190,15 +29286,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Carte di credito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -29207,5 +29303,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Modifica Stazione di riciclaggio"
@@ -29213,35 +29309,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Batterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Lattine"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Vestiti"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Cestino della spazzatura"
@@ -29249,5 +29345,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Modifica cestino della spazzatura"
@@ -29256,31 +29352,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Schienale"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "pietra"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plastica"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Colore"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "nero"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "marrone"
@@ -29359,39 +29455,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "verde"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "rosso"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "blu"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "grigio"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "bianco"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Quantità di posti"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
@@ -29400,30 +29496,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Modifica Albero"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Nascondi"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Blocco"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Fontana"
@@ -29432,10 +29528,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Modifica Fontana"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -29444,10 +29540,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Modifica acqua potabile"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Pompa antincendio"
@@ -29456,5 +29552,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Modifica pompa antincendio"
@@ -29462,5 +29558,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
@@ -29468,15 +29564,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Modifica culla per la vita"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Negozi"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Concessionaria"
@@ -29484,10 +29580,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Modifica concessionaria"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Negozio di biciclette"
@@ -29496,28 +29592,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Modifica negozio di biciclette"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Articoli di pulizia e bellezza"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Modifica negozio di articoli di pulizia e bellezza"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Minimarket"
@@ -29525,9 +29621,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Modifica minimarket"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Chiosco"
@@ -29535,27 +29631,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Modifica chiosco"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Libreria"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Modifica libreria"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Agenzia di viaggi"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Modifica agenzia di viaggi"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Macellaio"
@@ -29563,9 +29659,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Modifica Macellaio"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Panificio"
@@ -29573,9 +29669,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Modifica Panificio"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Fiorista"
@@ -29583,18 +29679,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Modifica Fiorista"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Prodotti biologici"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Modifica negozio di prodotti biologici"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Alcolici (non in Italia)"
@@ -29602,54 +29698,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Modifica negozio di alcolici (non in Italia)"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Bevande"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Modifica negozio di bevande"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Modifica negozio di informatica"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Elettronica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Modifica Negozio di Elettronica"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Modifica negozio di Hi-Fi"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Mobilia"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Modifica Negozio di Mobilia"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Giardinaggio"
@@ -29657,9 +29753,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Modifica giardinaggio"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Ferramenta"
@@ -29667,9 +29763,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Modifica Negozio di Ferramenta"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Fai-da-te"
@@ -29677,54 +29773,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Modifica negozio Fai-da-te"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Cartoleria"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Modifica cartoleria"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Parrucchiere/barbiere"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Modifica parrucchiere/barbiere"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Calzature"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Modifica Negozio di Scarpe"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Giocattoli"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Modifica Negozio di Giocattoli"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Videoteca"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Modifica videoteca"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Lavanderia a secco"
@@ -29732,9 +29828,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Modifica Lavanderia a secco"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -29742,9 +29838,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Modifica lavanderia"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Sport all''aperto"
@@ -29752,24 +29848,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Modifica sport all''aperto"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Modifica articoli sportivi"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Ottico"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Modifica Ottico"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Distributore automatico"
@@ -29777,5 +29873,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Modifica Distributore automatico"
@@ -29783,97 +29879,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Distributore automatico"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "Biglietti trasporto pubblico"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "Orari trasporto pubblico"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "Biglietti per il parcheggio"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "Alimenti"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "Bevande"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "Dolci"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "Sigarette"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "Cibo per animali"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "Giornali"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "giocattoli"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "francobolli"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "Schede SIM"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "buoni_telefonici"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "buoni"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr "camera d''aria per biciclette"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "preservativi"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "assorbenti"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "Sacchetto per escrementi"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Conto o carta fedeltà"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Contanti"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Banca"
@@ -29881,14 +29977,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Modifica banca"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Bancomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Cambiavalute"
@@ -29896,5 +29992,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Modifica cambiavalute"
@@ -29902,15 +29998,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Modifica bancomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Salute"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Ambulatorio"
@@ -29918,18 +30014,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Modifica ambulatorio"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Modifica dentista"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -29937,5 +30033,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Modifica Farmacia"
@@ -29943,9 +30039,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Vendita medicinali con obbligo di prescrizione"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Ospedale"
@@ -29953,10 +30049,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Modifica Ospedale"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -29965,5 +30061,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Modifica colonnina SOS"
@@ -29972,20 +30068,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Nome del punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -29993,5 +30089,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -30000,64 +30096,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Modifica veterinario"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Luoghi"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Nazione"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Modifica nazione"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Regione"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Modifica regione"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Provincia"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
@@ -30065,15 +30161,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Città"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Modifica città"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Paese"
@@ -30081,10 +30177,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Modifica paese"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Quartiere"
@@ -30092,25 +30188,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Modifica quartiere"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Frazione"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Modifica frazione"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Borgo"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Modifica borgo"
@@ -30118,5 +30214,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Località (luogo con nome, non popolato)"
@@ -30124,10 +30220,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Modifica località (luogo con nome, non popolato)"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Isola"
@@ -30135,10 +30231,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Modifica isola"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Isoletta"
@@ -30146,5 +30242,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Modifica isoletta"
@@ -30152,5 +30248,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
@@ -30158,10 +30254,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Modifica entrata di una grotta/caverna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Picco montuoso"
@@ -30169,10 +30265,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Modifica picco montuoso"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Ghiacciaio"
@@ -30180,10 +30276,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Modifica Ghiacciaio"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Vulcano"
@@ -30191,70 +30287,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Modifica vulcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Confini"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Nazionale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Amministrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Politico"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Parco nazionale"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Modifica Confine Parco Nazionale"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Albero"
@@ -30263,15 +30359,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Modifica albero singolo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Bosco"
@@ -30280,5 +30376,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Modifica bosco"
@@ -30286,17 +30382,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "Conifere"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "Mista"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Foresta"
@@ -30305,14 +30401,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Modifica area di foresta"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
@@ -30320,25 +30416,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Ghiaione"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Modifica ghiaione"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Boscaglia"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Modifica boscaglia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Prato alpino"
@@ -30346,10 +30442,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Modifica prato alpino"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Brughiera"
@@ -30357,5 +30453,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Modifica brughiera"
@@ -30363,5 +30459,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Aia"
@@ -30370,45 +30466,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Modifica aia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Prato"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -30417,25 +30513,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Giardino"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Erba"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Village Green"
@@ -30443,10 +30539,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Modifica Village Green"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Area comune (UK)"
@@ -30454,20 +30550,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Modifica area comune (UK)"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Parco"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -30475,5 +30571,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifica area di svago"
@@ -30481,15 +30577,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Area residenziale"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Modifica area residenziale"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -30497,9 +30593,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Modifica Cimitero"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -30507,39 +30603,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -30547,15 +30643,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Militare"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
@@ -30563,50 +30659,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Area in costruzione"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Ridestinazione d''uso"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d''uso"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Cava"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
@@ -30616,5 +30712,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Modifica un multi-poligono"
@@ -30626,5 +30722,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "segmento esterno"
@@ -30632,5 +30728,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "segmento interno"
@@ -30638,5 +30734,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr "Confine"
@@ -30647,5 +30743,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr "Modifica confine"
@@ -30653,36 +30749,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr "Tipo di confine"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr "amministrativo"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr "nazionale"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr "civile"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr "circoscrizione elettorale"
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr "Livello amministrativo"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr "Sotto-area"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr "Centro amministrativo"
@@ -30690,5 +30786,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
@@ -30697,5 +30793,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Modifica un divieto di svolta"
@@ -30703,34 +30799,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -30739,15 +30835,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "dal percorso"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "verso il percorso"
@@ -30755,5 +30851,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Itinerario"
@@ -30762,5 +30858,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Modifica un itinerario"
@@ -30768,5 +30864,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Tipo di itinerario"
@@ -30874,5 +30970,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30883,17 +30979,17 @@
 msgstr "bicicletta"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "sci"
@@ -30961,5 +31057,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30969,9 +31065,9 @@
 msgstr "pedone"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "deviazione"
@@ -30985,10 +31081,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metropolitana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
@@ -30996,31 +31092,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Rete"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Stato dell''itinerario"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
@@ -31029,30 +31125,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "segmento di itinerario"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "segmento opposto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "punto di fermata"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
@@ -31279,5 +31375,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "deprecato"
@@ -31930,4 +32026,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -32031,11 +32135,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "costruzioni umane"
@@ -32548,5 +32652,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "pontile"
@@ -32560,5 +32664,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "conduttura"
@@ -32702,13 +32806,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "struttura per lo svago"
@@ -32722,5 +32826,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "porto turistico"
@@ -32816,10 +32920,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "struttura di servizio"
@@ -32921,10 +33025,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "servizio al traffico"
@@ -33362,24 +33466,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "struttura di servizio (chiaro)"
@@ -33411,6 +33515,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "acqua (chiaro)"
@@ -33471,8 +33575,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "salute"
@@ -33825,26 +33929,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "negozio"
@@ -33916,8 +34020,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -34018,9 +34122,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turismo"
@@ -34108,9 +34212,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "attrazione storica"
@@ -34123,5 +34227,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "cava/miniera"
@@ -34135,5 +34239,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "discarica"
@@ -34155,5 +34259,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "bacino"
@@ -34167,5 +34271,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "aia"
@@ -34188,5 +34292,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "area commerciale (negozi)"
@@ -34200,5 +34304,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "industriale"
@@ -34212,5 +34316,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "ridestinazione d''uso"
@@ -34224,5 +34328,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "area agricola destinata alla costruzione"
@@ -34236,5 +34340,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "area ferroviaria"
@@ -34291,7 +34395,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "militare"
@@ -34305,5 +34409,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "cimitero"
@@ -34316,5 +34420,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "picco montuoso"
@@ -34329,5 +34433,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "ghiacciaio"
@@ -34341,5 +34445,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "vulcano"
@@ -34394,8 +34498,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "elemento naturale"
@@ -34409,5 +34513,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "boscaglia"
@@ -34421,5 +34525,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "brughiera"
@@ -34433,5 +34537,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "area boschiva non gestita"
@@ -34445,5 +34549,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "zona fangosa (sabbie mobili)"
@@ -34457,5 +34561,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "spiaggia"
@@ -34533,8 +34637,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "itinerario"
@@ -34623,12 +34727,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "confine"
@@ -34778,11 +34882,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "luogo"
@@ -34796,5 +34900,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "dati tiger"
@@ -34970,5 +35074,5 @@
 #: build/trans_validator.java:58
 msgid "cycleway with tag bicycle"
-msgstr "cycleway con etichetta bicycle"
+msgstr "pista ciclabile con etichetta bicycle"
 
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
@@ -35150,9 +35254,18 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid "closedway"
-#~ msgstr "percorso chiuso"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "La destinazione di tipo {0} con id {1} ha una versione non valida"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Il percorso selezionato non contiene il nodo selezionato."
+#~ msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Gradi Minuti Secondi"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Inserire un commento al caricamento (min. 3 caratteri)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Inserire un commento per questo insieme di modifiche (min. 3 caratteri)"
 
 #~ msgid "No data imported."
@@ -35215,7 +35328,4 @@
 #~ msgid "their version:"
 #~ msgstr "versione remota:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versione risolta:"
 
 #~ msgid "Resolve Conflicts"
@@ -35521,7 +35631,4 @@
 #~ msgid "GPX Track loaded"
 #~ msgstr "Tracciato GPS caricato"
-
-#~ msgid "Boat"
-#~ msgstr "Barca"
 
 #~ msgid "Motorboat"
@@ -36065,4 +36172,7 @@
 #~ "corrente {1}"
 
+#~ msgid "closedway"
+#~ msgstr "percorso chiuso"
+
 #~ msgid "Remove Selected"
 #~ msgstr "Elimina gli elementi selezionati"
@@ -37370,4 +37480,7 @@
 #~ "assegnerà <br>un nuovo id.<br>Sei d''accordo?</html>"
 
+#~ msgid "Target of type {0} with id {1} has invalid version"
+#~ msgstr "La destinazione di tipo {0} con id {1} ha una versione non valida"
+
 #~ msgid "Create house number and street name relation"
 #~ msgstr "Crea una relazione tra numero civico e nome della strada"
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 22568)
+++ applications/editors/josm/i18n/po/ja.po	(revision 22569)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-27 13:46+0000\n"
-"Last-Translator: ribbon <Unknown>\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-08-02 03:57+0000\n"
+"Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-07-28 09:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -26,5 +26,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -55,14 +55,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -79,9 +78,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -125,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -163,5 +162,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -235,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -249,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -267,11 +266,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -279,20 +279,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -327,5 +327,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "マージ"
@@ -395,5 +395,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -407,5 +407,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -427,4 +427,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -441,6 +442,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -452,5 +453,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -585,22 +586,22 @@
 msgstr "開かれた変更セットをダウンロード中 ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "ウェイの結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "複数のウェイを一つに結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "方向を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "逆転して結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -608,5 +609,5 @@
 msgstr "ウェイは現在の方向で結合できません。一方の方向にそろえますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -615,10 +616,10 @@
 "ウェイを結合できません（これらをノードの一列として統合することができません）"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0}ウェイを結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "結合するウェイを少なくとも二つ選択してください。"
@@ -665,10 +666,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -807,5 +808,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -871,10 +872,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "GPXにエクスポート..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "データをGPXファイルにエクスポートします。"
@@ -1066,5 +1067,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1491,20 +1492,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1528,5 +1529,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1537,6 +1538,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "エラー"
@@ -1563,5 +1564,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1569,5 +1570,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "最新データを保存します。"
@@ -1624,10 +1625,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "名前をつけて保存..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "現在のデータを新規ファイルに保存"
@@ -1672,5 +1673,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1697,5 +1698,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "いいえ、異常終了します"
@@ -1762,23 +1763,29 @@
 msgstr[0] "ウェイの簡素化 ( {0} このノードを削除)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "ウェイを分割"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "選択したノードでウェイを分割"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "現在の選択は分割できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "選択したノードは同じウェイで共有されていません。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "選択したノードは、いずれかのウェイの中間ではありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1791,20 +1798,11 @@
 "てください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "選択したノードは同じウェイで共有されていません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1814,5 +1812,5 @@
 "する）"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1822,5 +1820,5 @@
 "した。<br>これらを確認して必要なら訂正してください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1830,5 +1828,5 @@
 "らを確認して必要なら訂正してください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1978,5 +1976,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2989,22 +2987,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3149,6 +3147,6 @@
 msgstr "未決の競合を解決できません"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
@@ -3156,20 +3154,20 @@
 "ました"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "ノード {0} を削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "ウェイ {0} を削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "リレーション {0} を削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3177,5 +3175,5 @@
 msgstr[0] "{0} 個のオブジェクトを削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3183,5 +3181,5 @@
 msgstr[0] "{0} 個のノードを削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3189,5 +3187,5 @@
 msgstr[0] "{0} 個のウェイを削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3195,5 +3193,5 @@
 msgstr[0] "{0} 個のリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3346,5 +3344,5 @@
 msgstr "適用しますか?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3411,25 +3409,25 @@
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
-msgstr ""
+msgstr "ディレクトリ {0}を作成することができません。自動保存は無効となります。"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
-msgstr ""
+msgstr "ファイル {0}を作成することができません。他のファイル名が使用されます。"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "古いバックアップファイルを上書きますか？"
+msgstr "古いバックアップファイル{0}が削除できません。"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "キャッシュディレクトリ {0} の作成中にエラーが発生しました."
+msgstr "次の削除済みレイヤのバックアップ作成中にエラー: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3619,42 +3617,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "度分秒"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "射影された座標"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "南"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "北"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "西"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "東"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3662,5 +3663,5 @@
 msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3836,5 +3837,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "背景"
@@ -3981,5 +3982,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "次回から表示しない"
@@ -4007,5 +4008,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "鉄道"
@@ -4027,6 +4028,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4094,5 +4095,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "建物"
@@ -4178,5 +4179,5 @@
 msgstr "オブジェクトは削除されました"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4278,69 +4279,69 @@
 msgstr "パスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "使用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "オプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "このヘルプの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "標準のunix配置引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "境界囲みをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "ファイルを開く(ファイル/開くで開かれるファイルの全種類）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "bounding boxを生GPSとしてダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "(lat=x&lon=y&zoom=zがついた)URLで示される場所の生gpsをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "検索から選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "最大モードで起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "設定を既定に戻します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "言語の設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "Javaシステムのプロパティとして提供されるオプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "全てのユーザ設定用フォルダを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4353,9 +4354,9 @@
 "      使用メモリの最大サイズ（メガバイト単位）を指定することができます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4364,46 +4365,45 @@
 "パラメータ --downloadと--downloadgpsと--selectionは、この順序で処理されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "--selectionを使った場合、一部のデータだけをロードすることになります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "初期化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "プラグイン更新中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "更新されたプラグインをインストール中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "早期読み込みプラグインのロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "デフォルト設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "プラグインのロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+msgstr "未保存のOSMデータ"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "解決"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr "復元"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4412,5 +4412,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4506,33 +4506,33 @@
 msgstr "ズームアウト"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "拡大・縮小"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "マウスポインターで示される地理経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "マウスポインターで示されるオブジェクトの名前"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "マウスポインターで示される地理緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "これより前のウェイセグメントとこのウェイセグメントの間の角度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "描かれている線分の(コンパスの)向き"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "描きたい新規ウェイセグメントの長さ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4542,9 +4542,9 @@
 "ウスでこの表から直接選べます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(オブジェクトなし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4560,4 +4560,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "レイヤー ''{0}'' はレイヤーのリスト中になければなりません"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "数値"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "中国料理"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "商用"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5290,5 +5305,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "全て"
@@ -5370,6 +5385,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5379,5 +5394,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5517,5 +5532,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "変更セット"
@@ -5576,5 +5591,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5734,5 +5749,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5740,5 +5755,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5746,5 +5761,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5752,5 +5767,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5758,5 +5773,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5765,5 +5780,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5771,5 +5786,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5777,5 +5792,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5783,24 +5798,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>有効なフィルタ</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> 件の非表示オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> 件の無効化オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>フィルタのダイアログを閉じて全オブジェクトを見る。<p></html>"
@@ -5880,51 +5895,51 @@
 msgstr "ダイアログを閉じて、新しいノードを作成しない"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "レイヤー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "レイヤーの一覧"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "選択したレイヤーを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "選択したレイヤーの表示状態を切り替え"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "表示/非表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "選択したレイヤーの表示状態を切り替え"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "有効化"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "選択されたレイヤーを有効化"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "このレイヤーを他のレイヤーに結合"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "このレイヤを複製"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "選択したレイヤーを一つ上に上げます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "選択したレイヤーを一つ下に移動します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "レイヤーについての情報"
@@ -5934,5 +5949,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "リレーション"
@@ -7092,6 +7107,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7139,107 +7155,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "名前"
@@ -7600,5 +7616,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7686,5 +7702,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<差異あり>"
@@ -8168,4 +8184,5 @@
 "current layer"
 msgstr ""
+"貼り付けバッファのメンバーは追加できません。現在のレイヤに含まれていません"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
@@ -8439,5 +8456,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "境界"
@@ -8510,8 +8527,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "タイプ"
@@ -8540,6 +8557,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "不明な"
@@ -8892,5 +8909,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "競合が検出されました"
@@ -8961,14 +8978,15 @@
 msgstr "警告: エラーヘッダ \"{0}\" は想定されたパターンに一致しません"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "アップロードする変更の概略コメントを入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "アップロード用コメントを入力(最小3文字)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "不正なアップロードコメント"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "変更セットID:"
@@ -9417,5 +9435,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "アップロード"
@@ -9437,5 +9455,5 @@
 msgstr "更新するリレーションを初期化中 ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9443,60 +9461,94 @@
 msgstr "設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "データのアップロード方法と使用する変更セットを決定"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "新しい変更セットのタグ"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "変更セットのデータのアップロード先にタグを適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr "開かれた変更セットの管理とアップロードする変更セットの選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "詳細設定を構成"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "''{0}'' にアップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "変更のアップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "変更されたプリミティブをアップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "不正なアップロードコメント"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "逆順"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "続ける"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "キャンセルしてエディタに戻る"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "次回は表示しない"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "最初に正しいチャンクサイズを入力してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "不正なチャンクサイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "アップロードをキャンセルして編集に戻る"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9847,107 +9899,11 @@
 msgstr[0] "削除するオブジェクトの個数: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "線描画のカスタマイズ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "全体設定を使用"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "このレイヤーの点の間に線を引く。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "このレイヤーの点の間に線を引かない。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "線描画オプションの選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "配色のカスタマイズ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "既定"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "色選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "名前のついた地点からのマーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "{0} からの名前付きトラックポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "音声のインポート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>選択したGPXレイヤー ''{0}'' はサーバからダウンロードしたものです。<br>"
-"タイムスタンプの情報が無いため、音声データとの同期はできません。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "インポートできません"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "WAV音声ファイル(*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "{0} からの音声マーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "イメージのインポート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html>選択したGPXレイヤー ''{0}'' はサーバからダウンロードしたものです。<br>"
-"タイムスタンプの情報が無いため、写真との同期はできません。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9955,5 +9911,5 @@
 msgstr "名前: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9961,5 +9917,5 @@
 msgstr "記述: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9968,23 +9924,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "説明"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "時間間隔"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "長さ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "長さ: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9992,5 +9948,5 @@
 msgstr[0] "{0}ルート, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9998,10 +9954,10 @@
 msgstr[0] "{0} ウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "データレイヤーへ変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10012,21 +9968,21 @@
 "てください："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "{0}からのコンバート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10034,10 +9990,10 @@
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10045,10 +10001,10 @@
 msgstr "{0} メータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "リクエストあたりの最大面積："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10056,21 +10012,21 @@
 msgstr "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr "近隣をダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr "トラックのみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr "ウェイポイントのみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr "トラックおよびウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10082,9 +10038,9 @@
 "すか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10094,5 +10050,5 @@
 "に変更又は移動されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10102,23 +10058,119 @@
 "外します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "線描画のカスタマイズ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "全体設定を使用"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引く。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引かない。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "線描画オプションの選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "配色のカスタマイズ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "既定"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "色選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "名前のついた地点からのマーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} からの名前付きトラックポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "音声のインポート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>選択したGPXレイヤー ''{0}'' はサーバからダウンロードしたものです。<br>"
+"タイムスタンプの情報が無いため、音声データとの同期はできません。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "インポートできません"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "WAV音声ファイル(*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} からの音声マーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "イメージのインポート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>選択したGPXレイヤー ''{0}'' はサーバからダウンロードしたものです。<br>"
+"タイムスタンプの情報が無いため、写真との同期はできません。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "データレイヤー {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "ダウンロード領域の外"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "バージョン {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10126,11 +10178,11 @@
 msgstr[0] "検出された競合が {0} 個あります"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "クリックしてこのダイアログを閉じ、編集を続ける"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10138,36 +10190,36 @@
 msgstr[0] "{0} を削除しました"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0}は以下で構成されています:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "設定解除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "APIバージョン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "GPXレイヤーの変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "データセット一貫性テスト"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "問題はありませんでした"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "次の問題が見つかりました:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10178,5 +10230,5 @@
 "よ :</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10184,10 +10236,10 @@
 msgstr[0] "トラック"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
 msgstr[0] "ポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10195,5 +10247,5 @@
 msgstr[0] "{0}ポイントをもつトラック"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10201,5 +10253,5 @@
 msgstr[0] "{1}トラックを含む {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10207,24 +10259,28 @@
 msgstr[0] "{0} ポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "GPXに関連づける"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPXファイル(*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "ファイル {0} は、\"{1}\"という名前でですが、読み込まれました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "{0}の解析中にエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "\"{0}\"を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10236,34 +10292,34 @@
 "を読み取って、タイムゾーンを選択します。<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "写真の時刻(exifから取得):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "(写真から読み取った)GPSの時刻: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "タイムゾーンの選択: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "日付なし"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "他の写真を開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "GPSレシーバーの写真から時刻を同期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10273,93 +10329,93 @@
 "入力する形式を確認してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "不正な日付"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<GPXトラックがまだ読み込まれていません>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPXトラック: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "ほかのGPXトレースを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr "<html>正確な時計の写真を使用のこと,<br>例. GPS レシーバ画面</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "自動推測"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr "最初の写真と最初のGPXポイントをマッチさせます"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "手動調整"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "次の位置を上書きする "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "EXIFデータ中に位置情報を含む画像 ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "タグ付け済みの画像 ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "地図にサムネイル画像を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "タイムゾーン: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "オフセット:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "GPXトラックに画像を関連づけます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "関連付け"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "不正なタイムゾーン"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "不正なオフセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "再試行"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "イメージがマッチしません!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "gpx が選択されていません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10369,20 +10425,20 @@
 "<html>写真は<b>{1}</b> 件中<b>{0}</b> 件がGPSトラックに一致しました。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "タイムゾーン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "分: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "秒: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10390,5 +10446,5 @@
 msgstr[0] "{0} 日の時差"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10398,21 +10454,21 @@
 "合できます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "トラックへのフォトマッチに失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "タイムゾーンとオフセットを調整してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "選択した写真には時間情報がありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "写真は時間情報を含んでいません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10422,17 +10478,17 @@
 "してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPXトラックは、時間情報を持っていません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "GPXトラックを選択しなければなりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "GPXトラックの選択がありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10443,5 +10499,5 @@
 "期待する形式: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10452,56 +10508,52 @@
 "期待されるフォーマット: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "EXIFからGPS位置を取得"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "ディレクトリ走査の開始"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "選択されたファイルのひとつがヌルでした"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "写真を取り込む"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "{0}を読み込んでいます ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "標準的なディレクトリへのパスを入手できません {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "ディレクトリ {0} を走査"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "ジオタグのついた画像"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "GPXに関連づける"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10509,5 +10561,5 @@
 msgstr[0] "{0} の画像がロードされました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10515,10 +10567,10 @@
 msgstr[0] "GPSタグが必要なものが {0}見つかりました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "ディスクから画像ファイルを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10529,5 +10581,5 @@
 "に失われます。</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "画像ファイルが削除できません。"
@@ -10629,14 +10681,14 @@
 msgstr "JPEGイメージ(*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPSマーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
 msgstr[0] "マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10644,9 +10696,21 @@
 msgstr[0] "{0}は、{1}マーカーからなる"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "このレイヤーには、開始オフセットを指すオーディオマーカーがありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "テキスト/アイコンを表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "マーカーテキストとアイコンの表示状態を切り替え"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "音声の同期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10655,5 +10719,5 @@
 "す。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10661,30 +10725,18 @@
 msgstr "地点 {0}で音声同期をとります"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "再生されているレイヤーと同期させることができません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "再生の最初に音声マーカーを作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr "マークしたいトラックポイントでオーディオを一時停止する必要があります。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr "このレイヤーには、開始オフセットを指すオーディオマーカーがありません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr "テキスト/アイコンを表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "マーカーテキストとアイコンの表示状態を切り替え"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11604,4 +11656,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "なし"
@@ -11616,5 +11669,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "HDOP（垂直精度劣化度）の値の円を描いてください"
@@ -11717,5 +11770,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "一方通行など、必要なときのみ向きを表示"
@@ -11723,5 +11776,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "ウェイの開始のみ"
@@ -11751,5 +11804,20 @@
 msgstr "GPX読み込み時にマーカーを作成。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "作者"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "ディーゼル"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "ボート"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11759,9 +11827,9 @@
 "る。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "GPSトラックのポイント間の線"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11769,34 +11837,34 @@
 msgstr "ローカルファイルに線を描くの最大長(m)。''-1''にすると全てに線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "ローカルファイルに対する最大長 (メートル)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "線を描く最大長(m)。''-1''にすると全ての線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "最大長（ｍ）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPSの点をつないで、方向の矢印付きの線を引く。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "数式演算ではなく、テーブル検索によって矢印の方向を決める。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11804,13 +11872,13 @@
 msgstr "これより短いウェイでは方向の矢印を描画しない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（ピクセル）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "GPSポイントに大きなドットを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11820,9 +11888,9 @@
 "可能です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "速度により点とトラックセグメントの色を決める。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11830,46 +11898,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "平均速度の違いによって、配色の仕方を調整するようにする。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "トラックと点の配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "ウエイポイントの記述"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "ウェイのセグメントに方向のヒントを描く。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "ウェイ内の全セグメントで順序番号を表示する。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "サーバから読み出したデータの境界を描く。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "ウェイの修正が容易になるように、選択モードで仮想のノードを表示します。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "操作対象とするレイヤー以外のレイヤーを別の色で表示します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSMデータ"
@@ -12227,21 +12304,26 @@
 msgstr "設定を有効にするにはJOSMを再起動する必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "投影法"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "射影コード"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "座標を次の単位で表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "投影法"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "射影コード"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "測定するレイヤー"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "地図投影法"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12821,5 +12903,5 @@
 msgstr "新しいタグを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12830,49 +12912,49 @@
 "にあるものと同じでなければなりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "この地物の詳細情報"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "不明な必要条件: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "利用可能なロール"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr "ロール"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr "件数"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr "エレメント"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "オプションの属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr "親の無いロール要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr "親の無いサブ要素をプリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12882,15 +12964,15 @@
 msgstr "タグ付けプリセットのソース {0} を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12899,17 +12981,17 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12927,26 +13009,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "検索: "
+msgstr "プリセットを検索"
 
 #: ../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
-#, fuzzy
 msgid "Search presets"
-msgstr "オブジェクトを検索"
+msgstr "プリセットを検索"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "選択リストにローカライズされた名前を表示"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "検索: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13262,5 +13340,5 @@
 msgstr "ファイル \"{0}\" の解析に失敗"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です"
@@ -14810,5 +14888,5 @@
 "は失敗</strong>です。<br><br>エラーメッセージ:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15097,5 +15175,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "アドレスの補間"
@@ -15443,41 +15521,41 @@
 msgstr "次回は表示しない"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "建物の住所"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "家番号:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "通りの名前"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "増加"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "減少"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "数値:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr "高度な設定"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15494,25 +15572,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "ビルのサイズをセット"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "住所ダイアログを使用"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "ビルの幅:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr "拡張..."
@@ -15550,18 +15628,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "建物"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "ストリート"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr "住所の入力"
@@ -15735,7 +15813,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
-#, fuzzy
 msgid "Use \"Tableau d''assemblage\""
-msgstr "Tableau d'Assemblageを選択"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -15799,8 +15876,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "水域(湖沼)"
@@ -15861,6 +15938,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "住所"
@@ -16357,34 +16434,34 @@
 "最初にそのひとつを選んで、やり直してください"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "空のレイヤー"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMSレイヤー ({0}), {1}このタイル読み込み"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "ベクターではありません。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "ラスターサイズ: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "ベクタライズされました。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "都道府県 bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16395,15 +16472,15 @@
 "であるべきです"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "キャッシュフォーマットエラー"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+"キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません"
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-"キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr "ランベルトゾーンキャッシュエラー"
@@ -16482,22 +16559,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "オブジェクトをダウンロード..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "選択されたウェイの最後にマップデータをダウンロード"
+msgstr "選択したウェイに沿ってOSMデータをダウンロード"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "すぐにダウンロード"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "ダウンロードするタスクを少なくとも一つ選んでください。"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16507,12 +16580,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "テスト {0}/{1}:  {2} 開始"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "{0}:{1}を走査中にエラー"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16543,9 +16616,9 @@
 msgstr "複製したウェイの作成"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "GPSトラックを編集するためのレイヤーです。"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "匿名時間も含めたGPXレイヤーへのコンバート"
@@ -16555,5 +16628,5 @@
 msgstr "Gpx編集"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "gpxトラックの編集"
@@ -16562,11 +16635,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "GPXレイヤーからパスをインポート"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "今あるパスをドロップ"
@@ -16576,5 +16649,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "GPXデータのレイヤーがありません"
@@ -16584,13 +16657,13 @@
 msgstr "子スクリプトが不正なデータを返した"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr "名前:"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr "コマンド行"
@@ -16621,5 +16694,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
 msgid "Install"
-msgstr ""
+msgstr "インストール"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
@@ -16833,5 +16906,5 @@
 msgstr "ジオタグのない写真を表示"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "インポートした画像"
@@ -17186,8 +17259,6 @@
 msgstr "測定ウィンドウを開く"
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "リセット"
@@ -17218,5 +17289,5 @@
 msgstr "選択した2つのノード間の角度"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "測定するレイヤー"
@@ -17308,5 +17379,5 @@
 msgstr "OpenStreetBugs ダウンロード・ループ"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugsに報告された問題点を表示"
@@ -17379,13 +17450,13 @@
 msgstr "キュー"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "オフライン"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "オンライン"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17501,95 +17572,95 @@
 msgstr "Firefoxの実行ファイル"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "読み込みエラー！"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "書き込みエラー！"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "画像ヘッダに座標を書き込む"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr "次のファイルのexif ヘッダに位置情報を書き込む:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "設定"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "バックアップファイルを保持"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "ファイル更新時刻を変更:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "GPS時間に"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "以前の値に（mtimeを変更しない）"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr "Photo Geotagging プラグイン"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "位置情報を画像ファイルに書き込み中"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "mtimeを読み込めません。"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "mtime を書き込めません。"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "ファイルを削除できません！"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "ファイルの名前は変更できませんでした。"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 "<html><h3>イメージのディレクトリに古いバックアップファイルがあります</h3>"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "古いバックアップファイルを上書きますか？"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "古いバックアップファイルを保持して継続"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "上書き"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "一時ファイルを削除できません!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "テスト失敗：mtimeを読み込めません。"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "テスト失敗：mtimeを書き込めません。"
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "画像ヘッダに座標を書き込む"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -17630,9 +17701,9 @@
 msgstr "ファイルからの新しい画像..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "画像は正しく作成されませんでした。"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "マップオブジェクトが見つかりません。"
@@ -17810,20 +17881,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "解決したバージョン:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "全てのリモコン操作を手動で確認"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "JOSMをほかのアプリーケーションから制御できるようにするプラグインです。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "リモート制御"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "リモート制御プラグインの設定。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17834,9 +17910,9 @@
 "会話をするほかのアプリケーションが参照するので、ポート番号は変更できません。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "許可されたアクション"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
@@ -17844,26 +17920,28 @@
 "求されました。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "リクエストの詳細: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "本当にこれを許可してよろしいですか？"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "リモート制御の指示を確認した"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr "リモート制御より新しいノードを作成するかどうか問合せがきました。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -17871,17 +17949,23 @@
 "た。:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
-msgstr ""
-
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+msgstr "変更セット全体を戻す"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
-msgstr ""
-
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+msgstr "選択分だけ戻す"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
-msgstr ""
-
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+msgstr "選択分を戻し、削除したオブジェクトを復元"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17889,5 +17973,5 @@
 msgstr "変更セットを元に戻す"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "取り消す"
@@ -17967,5 +18051,5 @@
 #, java-format
 msgid "Sign {0}"
-msgstr ""
+msgstr "標識 {0}"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115
@@ -18086,41 +18170,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "スリッピーマップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "自動ズーム"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "タイルの読み込み"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "タイル情報を表示"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "全てのタイルをロード"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "ズームアップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "ズームダウン"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "タイルのキャッシュをフラッシュ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "画像 "
@@ -18420,4 +18504,14 @@
 msgid "Terrace"
 msgstr "テラスハウス"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "区切り"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19119,6 +19213,6 @@
 msgstr "欠落したタグ {0}={1} を追加"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19128,9 +19222,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr "直ちに分割"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr "ウェイを分割"
@@ -19209,6 +19303,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19216,5 +19310,5 @@
 msgstr "妥当性検証エラー"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "妥当性検証エラー"
@@ -19456,32 +19550,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "重複したノードを統合しますか？"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "ノードの複製"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "ノードの複製"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "重複したノードを統合しますか？"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "ノードの複製"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "重複したノードを統合しますか？"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19518,5 +19606,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -20039,5 +20127,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "領域"
@@ -20177,10 +20265,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr "ビデオ中の現在位置を表示"
@@ -20326,10 +20414,10 @@
 msgstr "walking-papers.org からの情報を読み取れませんでした。idは \"{0}\""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20531,28 +20619,24 @@
 "間違った座標にたどりつく可能性があります。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "自動ダウンロード"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(無効化)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS レイヤー ({0}), 自倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20566,17 +20650,17 @@
 "設定を<br>チェックしてください。<br>強制的にWMS タイルを取得しますか？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "はい、画像を取得します"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "不正なURL？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20584,48 +20668,52 @@
 "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "誤ったタイルのリロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "アルファチャンネル"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "WMSレイヤーをファイルに保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "WMS レイヤーを保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "WMS レイヤーをロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "ファイルフォーマットエラー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "ファイルの読み込みエラー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "WMSブックマークをセット"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "自動ダウンロード"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20704,5 +20792,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20739,5 +20827,5 @@
 msgstr "オーディオ装置は使えません"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20759,5 +20847,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "森"
@@ -20776,71 +20864,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "行政区境"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "増加"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "線"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "マルチポリゴン"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "ネットワーク"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "公共輸送機関"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "通行制限"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "ルート"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "サイト"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "水路"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -21122,7 +21200,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "このトラックに沿ってOSMからダウンロード"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -21347,6 +21424,11 @@
 msgstr "1つのブロックからテラスハウスを作成する"
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21355,5 +21437,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21362,5 +21444,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21369,10 +21451,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr "OSMデータベースからの削除取消を許可"
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21383,5 +21465,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21391,5 +21473,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21400,15 +21482,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21417,5 +21499,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21548,5 +21630,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "道路番号"
@@ -22085,5 +22167,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "金属"
@@ -22096,5 +22178,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "森"
@@ -22398,9 +22480,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "はい"
@@ -22510,9 +22592,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "いいえ"
@@ -22771,5 +22853,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "居住区域内道路"
@@ -22818,5 +22900,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "敷地内道路"
@@ -22851,5 +22933,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "工事中"
@@ -22936,5 +23018,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "ハイキング"
@@ -22969,5 +23051,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "中間"
@@ -23137,14 +23219,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "操作員"
@@ -23412,6 +23494,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "高度"
@@ -23862,5 +23944,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "沼地、湿地"
@@ -24266,5 +24348,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "電圧"
@@ -24628,31 +24710,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "営業時間"
@@ -24712,90 +24794,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "月-金 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "火-日 08:00-15:00; 土 08:00-12:00"
@@ -24908,7 +24990,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "参照番号"
@@ -24924,5 +25006,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "地下"
@@ -24935,6 +25017,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "料金"
@@ -25110,5 +25192,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "車いす"
@@ -25145,6 +25227,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "避難所"
@@ -25152,5 +25234,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "ベンチ"
@@ -25269,5 +25351,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "ビーコン"
@@ -25428,5 +25510,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -25434,73 +25516,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "サンドイッチ"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "寿司"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -25508,17 +25595,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "チキン"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "カフェ"
@@ -25526,9 +25613,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -25536,18 +25623,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "パブの編集"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "バー"
@@ -25555,9 +25643,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "バーの編集"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -25565,24 +25653,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "博物館"
@@ -25590,9 +25678,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "動物園"
@@ -25601,9 +25689,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -25611,24 +25699,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "美術館"
@@ -25636,5 +25724,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -25642,19 +25730,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "案内所"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "詳細なグレード"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "地形"
@@ -25692,5 +25780,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25698,28 +25786,28 @@
 msgstr "ストリート"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "スキーム"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "表示されたエリア"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "サイト"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "市区"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "地方"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "詳細な説明"
@@ -25729,5 +25817,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "表示されたルート:"
@@ -25735,5 +25823,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "ハイキング"
@@ -25741,6 +25829,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "サイクリング"
@@ -25748,5 +25836,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "マウンテンバイク"
@@ -25754,6 +25842,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "スキー"
@@ -25761,5 +25849,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "乗馬"
@@ -25767,46 +25855,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "... 他の可能な輸送モード"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "掲示板の内容"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "通知"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "履歴"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "野生生物"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "道しるべ"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "電柱"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "情報端末"
@@ -25814,29 +25910,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "詳細な説明"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "音声ガイド"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "電話番号"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -25844,25 +25940,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "城"
@@ -25871,19 +25967,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -25892,9 +25988,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "戦場跡"
@@ -25902,10 +25998,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "戦場跡の編集"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "化石サイト"
@@ -25913,5 +26009,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "化石サイトの編集"
@@ -25919,15 +26015,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -25935,55 +26031,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "境界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "遊泳用プール"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "遊び場"
@@ -25991,35 +26087,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "つり"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "スポーツ"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -26033,6 +26129,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -26448,31 +26544,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "スポーツ"
@@ -26482,240 +26578,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr "アメリカンフットボール"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr "カナディアンフットボール"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr "ゲーリックフットボール"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr "ラグビーリーグ"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr "(通常の)ラグビー"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "運動場"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "多目的"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -26757,23 +26853,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "タイプ"
@@ -26815,211 +26911,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "運動場"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "トラック"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "登山"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "スケート"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "水泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "水泳の編集"
@@ -27027,52 +27123,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "高度"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "射撃"
@@ -27080,163 +27176,163 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr "アメリカンフットボール"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr "アメリカンフットボールを編集"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr "カナディアンフットボール"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr "カナディアンフットボールを編集"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr "ゲーリックフットボール"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr "ゲーリックフットボールを編集"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr "ラグビーリーグ"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr "ラグビーリーグの編集"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr "ラグビー(通常の)"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr "ラグビー(通常の)の編集"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "野球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "ペロタ"
@@ -27244,41 +27340,41 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "テニス"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "建造物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "建物"
@@ -27286,5 +27382,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "公共の建物"
@@ -27292,10 +27388,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "役場"
@@ -27303,10 +27399,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "大使館"
@@ -27314,10 +27410,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "裁判所"
@@ -27326,10 +27422,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "刑務所"
@@ -27338,10 +27434,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "警察"
@@ -27351,10 +27447,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "消防署"
@@ -27363,10 +27459,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "郵便局"
@@ -27374,5 +27470,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -27380,15 +27476,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "学校"
@@ -27396,10 +27492,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "大学"
@@ -27407,10 +27503,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "短大"
@@ -27418,5 +27514,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "短大の編集"
@@ -27424,5 +27520,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "映画館"
@@ -27431,10 +27527,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "図書館"
@@ -27443,9 +27539,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "美術館"
@@ -27453,10 +27549,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "劇場"
@@ -27465,10 +27561,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -27478,5 +27574,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -27485,6 +27581,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "宗教"
@@ -27493,66 +27589,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "宗派"
@@ -27561,81 +27657,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "住所"
@@ -27644,5 +27740,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -27650,5 +27746,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "番地"
@@ -27656,25 +27752,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "ストリートの名前"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "都市名"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "国コード"
@@ -27683,5 +27779,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -27689,61 +27785,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "アルファベット順"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "工場"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "タワー"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "塔の種類"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "通信用"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "観察"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "高さ(メートル)"
@@ -27751,25 +27847,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "灯台"
@@ -27777,10 +27873,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "風車"
@@ -27788,10 +27884,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -27800,41 +27896,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "ガス"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "熱"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "下水"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "どれかの実体"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "ロケーション"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "水中"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -27844,10 +27940,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "クレーン"
@@ -27855,5 +27951,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "クレーンの編集"
@@ -27861,10 +27957,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -27872,10 +27968,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -27883,23 +27979,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "インドア"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "アウトドア"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "公開"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "発電機"
@@ -27909,35 +28005,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "変電所"
@@ -27946,10 +28042,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -27958,5 +28054,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -27964,10 +28060,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "ライン参照"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "送電塔"
@@ -27978,23 +28074,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "送電塔"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "電柱"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "塔の参照番号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "送電線"
@@ -28003,78 +28099,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "線の種類"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "線"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "細い線"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "電力線束のうち良導体の線の数"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "シングル"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "ダブル"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "３"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "４"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "トイレ"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "制限"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "電話"
@@ -28083,5 +28177,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -28089,5 +28183,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "コイン"
@@ -28095,5 +28189,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "備考"
@@ -28101,5 +28195,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -28107,5 +28201,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -28113,15 +28207,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "リサイクル"
@@ -28130,5 +28224,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -28136,35 +28230,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "ゴミ箱"
@@ -28172,5 +28266,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "ゴミ箱を編集"
@@ -28179,31 +28273,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "背もたれ"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "素材"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "石"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "プラスチック"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "黒"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "茶"
@@ -28282,39 +28376,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "緑"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "赤"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "青"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "グレー"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "白"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "席の数"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -28323,30 +28417,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "噴水"
@@ -28355,10 +28449,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -28367,10 +28461,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "消火栓"
@@ -28379,5 +28473,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "消火栓を編集"
@@ -28385,5 +28479,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -28391,15 +28485,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "カーディーラ"
@@ -28407,10 +28501,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "自転車屋"
@@ -28419,28 +28513,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "薬品屋"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -28448,9 +28542,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "キオスク"
@@ -28458,27 +28552,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "本屋"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "本屋を編集"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "精肉店"
@@ -28486,9 +28580,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "パン屋"
@@ -28496,9 +28590,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "生花店"
@@ -28506,18 +28600,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "酒屋"
@@ -28525,54 +28619,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "酒屋の編集"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "酒屋(飲み物屋)の編集"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "家電店"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "家具店"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -28580,9 +28674,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "金物屋"
@@ -28590,9 +28684,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -28600,54 +28694,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "文具店"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "靴店"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "ビデオ"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -28655,9 +28749,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "ランドリー"
@@ -28665,9 +28759,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -28675,24 +28769,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "メガネ屋"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -28700,5 +28794,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -28706,97 +28800,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "公共輸送計画"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "糞袋"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "決済または会員用カード"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "銀行"
@@ -28804,14 +28898,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "銀行の編集"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "両替"
@@ -28819,5 +28913,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -28825,15 +28919,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "医院"
@@ -28841,18 +28935,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "薬局"
@@ -28860,5 +28954,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -28866,9 +28960,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "調剤薬局"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "病院"
@@ -28876,10 +28970,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -28888,5 +28982,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -28895,20 +28989,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -28916,5 +29010,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "動物病院"
@@ -28923,64 +29017,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "地理学"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "大陸"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "国(country)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "州(state)"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "地方"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "郡"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "郡の編集"
@@ -28988,15 +29082,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "市区"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "町"
@@ -29004,10 +29098,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -29015,25 +29109,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "村"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -29041,5 +29135,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "地域"
@@ -29047,10 +29141,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "島"
@@ -29058,10 +29152,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "島の編集"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "小島"
@@ -29069,5 +29163,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "小島を編集"
@@ -29075,5 +29169,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -29081,10 +29175,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "山頂"
@@ -29092,10 +29186,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "氷河"
@@ -29103,10 +29197,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "火山"
@@ -29114,70 +29208,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "国境"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "地点名"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "国立公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "樹木・林"
@@ -29186,15 +29280,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "森"
@@ -29203,5 +29297,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -29209,17 +29303,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "森林"
@@ -29228,14 +29322,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -29243,25 +29337,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "低木林"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "山(Fell)"
@@ -29269,10 +29363,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "荒れ地"
@@ -29280,5 +29374,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -29286,5 +29380,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -29293,45 +29387,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "農地"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -29339,25 +29433,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "庭園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "里山"
@@ -29365,10 +29459,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "共有地"
@@ -29376,20 +29470,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -29397,5 +29491,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -29403,15 +29497,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "墓所"
@@ -29419,9 +29513,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -29429,39 +29523,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "商用"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "工業"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -29469,15 +29563,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "軍用"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -29485,50 +29579,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "採石場"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
@@ -29538,5 +29632,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -29548,5 +29642,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "外側のセグメント"
@@ -29554,5 +29648,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -29560,5 +29654,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -29569,5 +29663,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -29575,36 +29669,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29612,5 +29706,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -29619,5 +29713,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -29625,34 +29719,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -29661,15 +29755,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "ウェイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "ウェイへ"
@@ -29677,5 +29771,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "ルート"
@@ -29684,5 +29778,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -29690,5 +29784,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "ルート種類"
@@ -29796,5 +29890,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29805,17 +29899,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "スキー"
@@ -29883,5 +29977,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29891,9 +29985,9 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "迂回路"
@@ -29907,10 +30001,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -29918,31 +30012,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "ルート状態"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -29951,30 +30045,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -30201,5 +30295,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "破棄された"
@@ -30852,4 +30946,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30953,11 +31055,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "人工物"
@@ -31470,5 +31572,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "桟橋"
@@ -31482,5 +31584,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "パイプライン"
@@ -31624,13 +31726,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "レジャー"
@@ -31644,5 +31746,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "マリーナ"
@@ -31738,10 +31840,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "アメニティ"
@@ -31843,10 +31945,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "アメニティ_交通"
@@ -32284,24 +32386,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "アメニティ_信号"
@@ -32333,6 +32435,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "信号_水域"
@@ -32393,8 +32495,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "健康"
@@ -32747,26 +32849,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "店"
@@ -32838,8 +32940,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "ホテル"
@@ -32940,9 +33042,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "旅行関係"
@@ -33030,9 +33132,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "史跡"
@@ -33045,5 +33147,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "石切り場"
@@ -33057,5 +33159,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "埋め立て地"
@@ -33077,5 +33179,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -33089,5 +33191,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "農家の庭"
@@ -33110,5 +33212,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "小売りの商用地"
@@ -33122,5 +33224,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "工業地"
@@ -33134,5 +33236,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -33146,5 +33248,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "緑地"
@@ -33158,5 +33260,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "鉄道公園"
@@ -33213,7 +33315,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "軍用地"
@@ -33227,5 +33329,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "共同墓地"
@@ -33238,5 +33340,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "山頂"
@@ -33251,5 +33353,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "氷河"
@@ -33263,5 +33365,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "火山"
@@ -33316,8 +33418,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "自然"
@@ -33331,5 +33433,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "低木"
@@ -33343,5 +33445,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "荒地"
@@ -33355,5 +33457,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "森林エリア"
@@ -33367,5 +33469,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "泥"
@@ -33379,5 +33481,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "砂浜"
@@ -33455,8 +33557,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "ルート"
@@ -33545,12 +33647,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "行政区境"
@@ -33700,11 +33802,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "場所"
@@ -33718,5 +33820,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "tiger_data"
@@ -34072,6 +34174,16 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "closedway"
-#~ msgstr "閉じたウェイ"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "度分秒"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "アップロード用コメントを入力(最小3文字)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）"
 
 #~ msgid "Move"
@@ -34245,4 +34357,7 @@
 #~ msgid "y from"
 #~ msgstr "Y軸"
+
+#~ msgid "closedway"
+#~ msgstr "閉じたウェイ"
 
 #~ msgid "Contacting the OSM server..."
@@ -34477,7 +34592,4 @@
 #~ msgstr "モーターボート"
 
-#~ msgid "Boat"
-#~ msgstr "ボート"
-
 # http://en.wikipedia.org/wiki/Draw_bridge
 #~ msgid "Drawbridge"
@@ -34551,7 +34663,4 @@
 #~ msgid "their version:"
 #~ msgstr "相手のバージョン:"
-
-#~ msgid "resolved version:"
-#~ msgstr "解決したバージョン:"
 
 #~ msgid "Could not read from URL: \"{0}\""
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 22568)
+++ applications/editors/josm/i18n/po/nb.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-11 20:44+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 12:38+0000\n"
 "Last-Translator: Stian Ellingsen <stiell@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@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-07-28 09:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 17:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -227,5 +226,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -241,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -259,11 +258,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -271,20 +271,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -317,5 +317,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Flett"
@@ -385,5 +385,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -397,5 +397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -417,4 +417,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -431,6 +432,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -442,5 +443,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -575,22 +576,22 @@
 msgstr "Laster ned åpne endringsset"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Sammenføy linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Sammenføy flere linjer til én"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Endre retninger?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Snu og sammenføy"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -600,5 +601,5 @@
 "retningen på noen av linjene?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -606,10 +607,10 @@
 msgstr "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sammenføy {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Velg minst to linjer å sammenføye."
@@ -656,10 +657,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -797,5 +798,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -861,10 +862,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Eksporter til GPX …"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Eksporter dataene til GPX-fil."
@@ -1054,5 +1055,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1465,20 +1466,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1502,5 +1503,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1511,6 +1512,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Feil"
@@ -1537,5 +1538,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1543,5 +1544,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Lagre gjeldende data."
@@ -1598,10 +1599,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Lagre som …"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Lagre aktive data i ny fil."
@@ -1645,5 +1646,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1670,5 +1671,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Nei, avbryt"
@@ -1737,18 +1738,24 @@
 msgstr[1] "Forenkle linjer (fjern {0} noder)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Splitt linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Splitt en linje i den valgte noden."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Kan ikke splitte med dette utvalget"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Valgte noder er ikke på samme linje."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1756,5 +1763,5 @@
 msgstr[1] "Valgte noder er ikke del av en linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1768,20 +1775,10 @@
 "Mer enn én linje bruker de valgte nodene. Velg aktuell linje i tillegg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Valgte noder er ikke på samme linje."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Valgt linje inneholder ikke valgt node."
-msgstr[1] "Valgt linje inneholder ikke de valgte nodene."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Velg to eller flere noder for å splitte sirkelformet linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1791,5 +1788,5 @@
 "linjen.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1797,5 +1794,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1803,5 +1800,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1949,5 +1946,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2929,22 +2926,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3087,25 +3084,25 @@
 msgstr "kan ikke løse uavgjort konflikt"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Slett linje {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3114,5 +3111,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3121,5 +3118,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3128,5 +3125,5 @@
 msgstr[1] "Slett {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3135,5 +3132,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3288,5 +3285,5 @@
 msgstr "Gjennomføre?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3361,17 +3358,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Feil ved lesing av fil i mappa {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Klarte ikke å lage fullstendig sti til mappa  {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Feil ved oppretting av mappe for mellomlager: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3541,42 +3538,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Grader, minutter, sekunder"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "V"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "Ø"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3584,5 +3584,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3751,5 +3751,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "bakgrunn"
@@ -3893,5 +3893,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr ""
@@ -3919,5 +3919,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "jernbane"
@@ -3939,6 +3939,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4007,5 +4007,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "bygning"
@@ -4092,5 +4092,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4191,69 +4191,69 @@
 msgstr "Passord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "bruk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Vis hjelp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix-geometri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Last ned områdeavgrensing"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Last ned området i URL (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Last ned områdeavgrensing som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Velg med gitt søkestreng"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Start maksimert"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Gå tilbake til standardinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4263,9 +4263,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4273,46 +4273,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Klargjør"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Laster første programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Setter standardverdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Bygger opp hovedskjermbilde"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Laster inn programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Løs"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4321,5 +4320,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4415,33 +4414,33 @@
 msgstr "Forminsk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "målestokk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Lengdegrad ved musepekeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Navn på objekt ved musepeker"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Breddegrad ved musepekeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Vinkel mellom forrige og nåværende linjesegment."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Kompassretning på segmentet som tegnes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Lengden på segmentet som tegnes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4449,9 +4448,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4467,4 +4466,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Adkomstvei"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "kinesisk"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Næringsområde"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5201,5 +5215,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "alle"
@@ -5282,6 +5296,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5292,5 +5306,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5419,5 +5433,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr ""
@@ -5478,5 +5492,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5635,5 +5649,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5641,5 +5655,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5647,5 +5661,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5653,5 +5667,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5659,5 +5673,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5666,5 +5680,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5672,5 +5686,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5678,5 +5692,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5684,24 +5698,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5781,51 +5795,51 @@
 msgstr "Lukk dialogen og ikke opprett et nytt punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Liste over alle innleste lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Slå av/på visning av Lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Vis/Skjul"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Slå av/på visning av Lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Flytt laget en rad opp."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Flytt laget en rad ned."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr ""
@@ -5835,5 +5849,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relasjoner"
@@ -6986,6 +7000,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7033,107 +7048,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Navn"
@@ -7471,5 +7486,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7556,5 +7571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<different>"
@@ -8284,5 +8299,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8355,8 +8370,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Type"
@@ -8385,6 +8400,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "ukjent"
@@ -8716,5 +8731,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Konflikter avdekkeet"
@@ -8777,14 +8792,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Gi en kort kommentar for endringene du laster opp:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Skriv inn din merknad"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9215,5 +9231,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9235,5 +9251,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9241,60 +9257,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Last opp endringer"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Reset"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Fortsett"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Ikke vis igjen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9614,103 +9662,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Tilpass linjetegning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Bruk globale indstillinger."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Tegn linjer mellem punkter i dette laget."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Tegn ikke linjer mellem punkt i dette laget."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Velg linjetegnings-innstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Tilpass farge"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Velg en farge"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Markører fra navngitte punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Navngivne sporpunkt fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Importer lyd"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-lydfiler (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Lyd-markører fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importer bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9718,5 +9674,5 @@
 msgstr "Navn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9724,5 +9680,5 @@
 msgstr "Beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9732,23 +9688,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Lengde: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9757,5 +9713,5 @@
 msgstr[1] "{0} ruter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9764,10 +9720,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Konverter til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9777,21 +9733,21 @@
 "skadeligt <br>Se her for å laste inn GPS spor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Konvertert fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9799,10 +9755,10 @@
 msgstr "Last ned fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Last ned alt innenfor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9810,10 +9766,10 @@
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Max areal per forespørsel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9821,21 +9777,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9847,9 +9803,9 @@
 "Ønsker du<br>å fortsette?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9859,5 +9815,5 @@
 "ble utelatt eller flyttet til start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9867,23 +9823,115 @@
 "utelatt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Tilpass linjetegning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Bruk globale indstillinger."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Tegn linjer mellem punkter i dette laget."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Tegn ikke linjer mellem punkt i dette laget."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Velg linjetegnings-innstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Tilpass farge"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Velg en farge"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Markører fra navngitte punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Navngivne sporpunkt fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Importer lyd"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-lydfiler (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Lyd-markører fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importer bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "utenfor nedlastet område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "versjon {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9892,11 +9940,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9905,36 +9953,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "ikke satt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "API versjon: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Konvertér til GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9942,5 +9990,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9949,5 +9997,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -9955,5 +10003,5 @@
 msgstr[1] "punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -9962,5 +10010,5 @@
 msgstr[1] "et GPS spor med {0} punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -9969,5 +10017,5 @@
 msgstr[1] "{0} består av {1} GPS spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -9976,24 +10024,28 @@
 msgstr[1] "{0} punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Juster til GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Filer (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Fila {0} er lastet inn under navnet «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Feil oppsto ved sending av {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Klarte ikke lese «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10004,34 +10056,34 @@
 "<br>Skriv inn tidspunktet og velg tidssone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Tidspunkt for foto (fra EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Gps tidspunkt (lest i bildet ovenfor): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Jeg er i tidssonen: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Ingen dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Åpne et annet foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synkroniser tiden fra et bilde på GPS-mottakeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10041,93 +10093,93 @@
 "Sjekk format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Ugyldig dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Ingen GPX-spor er lastet inn>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX-spor: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Åpne flere GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Automatisk forslag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Tidssone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Forskyvning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Jevnfør bilder med GPX spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Jevnfør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Ugyldig tidssone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Ugyldig forskyvning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10137,20 +10189,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidssone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10159,5 +10211,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10167,21 +10219,21 @@
 "synkronisere bildene manuelt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Klarte ikke å koble foto til sporet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Juster tidssone og forskyvning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "Valgte foto har ikke tidskode."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Foto har ikke tidskode."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10189,17 +10241,17 @@
 msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX sporet har ikke tidskoder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Du bør velge et GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Intgen GPX-spor er valgt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10210,5 +10262,5 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10219,56 +10271,52 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Leser GPS posisjoner fra EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Starter scanning av mapper"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Les bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Leser {0} …"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Klarte ikke å lage fullstendig sti til mappa  {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanner mappa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fant tom fil i mappa {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Feil ved lesing av fil i mappa {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotaggede bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Juster til GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10277,5 +10325,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10284,10 +10332,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10296,5 +10344,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10394,9 +10442,9 @@
 msgstr "JPEG-bilder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPS-flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10404,5 +10452,5 @@
 msgstr[1] "flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10411,14 +10459,26 @@
 msgstr[1] "{0} består av {1} flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Ingen eksisterende lydmerker i dette lag å forskyve."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Slå av/på visning av tekst/ikoner"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Synkroniser lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Du må sætte lyden på pause når du hører synkroniserings-merket."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10426,30 +10486,18 @@
 msgstr "Lyd synkronisert i punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Kan ikke synkronisere i det avspillte lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Sett audio-merke ved avspilnings-start"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr "Du må  pause lyden på det punkt på sporet, hvor du vil ha merket."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Ingen eksisterende lydmerker i dette lag å forskyve."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Slå av/på visning av tekst/ikoner"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11309,4 +11357,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Ingen"
@@ -11321,5 +11370,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11422,5 +11471,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Bare relevante retningsvisere (f.eks. ved enveiskjøring)"
@@ -11428,5 +11477,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Bare ved enden av linja."
@@ -11456,5 +11505,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Opphavsmann"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Båt"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11462,9 +11525,9 @@
 msgstr "Lag automatisk eget markørlag for waypoints ved åpning av GPX lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellom GPS-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11474,9 +11537,9 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Max lengde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11485,10 +11548,10 @@
 "alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Maksimal lengde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11496,10 +11559,10 @@
 "Tvunget tegning av linjer dersom importerte data er uten linje informasjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspiler på linjer mellom GPS-punkt."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11507,5 +11570,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11513,13 +11576,13 @@
 msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Minste avstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11529,9 +11592,9 @@
 "for Lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Punkt og track linjer får farge etter hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11539,46 +11602,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillater å justere fargen etter gjennomsnittsfarten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Farge på punkt og track linjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "WayPoint Bilde"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningspiler på linjestykker."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Tegn nummer for linjesegmenter i hver linje."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omrisset av data hentet fra tjeneren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en annen farge."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -11934,21 +12006,26 @@
 msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Projeksjonsmetode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Vis koordinater som"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Projeksjonsmetode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Målelag"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Kartprojeksjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12491,5 +12568,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12498,49 +12575,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Mer informasjon om denne funksjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Valgfrie attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukjent type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12550,15 +12627,15 @@
 msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Feil ved lesing av {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Element type {0} kan brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12568,17 +12645,17 @@
 msgstr[1] "Endre {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Utvalget passer ikke formålet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Bruk Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12596,7 +12673,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Søk: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12605,17 +12681,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Søk etter objekt."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Zoom til utvalg"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Søk: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12914,5 +12987,5 @@
 msgstr "Klarte ikke lese fil «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Lesefeil: Strukturen i GPX fila er ukjent"
@@ -14365,5 +14438,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14634,5 +14707,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Interpoler adresser"
@@ -14974,41 +15047,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15025,25 +15098,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15081,18 +15154,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Bygninger"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15257,7 +15330,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
-#, fuzzy
 msgid "Use \"Tableau d''assemblage\""
-msgstr "Velg Tableau d'Assemblage"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -15321,8 +15393,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "vann"
@@ -15383,6 +15455,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "adresse"
@@ -15865,34 +15937,34 @@
 "Velg ett og prøv på nytt"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Blankt lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS lag ({0}), {1} kartutsnitt er lastet"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Er ikke vektorisert"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr "Er vektorisert"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Kommune avgrensing: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15903,15 +15975,15 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Feil i mellomlager format"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+"Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}"
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-"Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr "Feil Lambert sone på mellomlager"
@@ -15988,22 +16060,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Last ned objekt..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Last ned fra OSM langs dette spor"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Last ned programtillegg"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Velg minst én oppgave å laste ned"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16018,7 +16086,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Feil ved innlesing {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16049,9 +16117,9 @@
 msgstr "Opprett kopi av linje"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Lag for redigering av GPX-spor"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konverter til GPX lag med anonymisert tid"
@@ -16061,5 +16129,5 @@
 msgstr "Rediger GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "Rediger GPX-spor"
@@ -16068,11 +16136,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Importer spor fra GPX lag"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Slett eksisterende sti"
@@ -16082,5 +16150,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Fant ikke GPX lag"
@@ -16090,13 +16158,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16338,5 +16406,5 @@
 msgstr "Vis foto uten geotag posisjon"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Importerte bilder"
@@ -16695,8 +16763,6 @@
 msgstr "Åpne vindu med måleverdier"
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Reset"
@@ -16727,5 +16793,5 @@
 msgstr "Vinkel mellom to valgte Noder"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Målelag"
@@ -16817,5 +16883,5 @@
 msgstr "OpenStreetBugs download-løkke"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Vis tema i  OpenStreetBugs"
@@ -16886,13 +16952,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17007,93 +17073,93 @@
 msgstr "Firefox-programfil"
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -17135,9 +17201,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17315,20 +17381,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "rett versjon"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "Bekreft alle Remote control handlinger manuelt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Et programtillegg som tillater at JOSM blir styrt av et annet program"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Remote Control tilleggsprogram innstillinger."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17340,50 +17411,58 @@
 "fjernstyring av tilleggsprogrammet."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Tillatte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control er bedt om å laste data fra API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Be om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Vil du tillate dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Bekreft Remote Control handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control har bedt om data fra denne URL:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17391,5 +17470,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Tilbakestill"
@@ -17588,41 +17667,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Last Kartbilde"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Hent alle kartbilder"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Zoom inn"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Zoom ut"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Tøm bildehurtiglager"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "bilde "
@@ -17926,4 +18005,14 @@
 msgid "Terrace"
 msgstr "Terasse"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Skilletegn"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18612,6 +18701,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18621,9 +18710,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18702,6 +18791,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18709,5 +18798,5 @@
 msgstr "Valideringsfeil"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Ingen valideringsfeil"
@@ -18948,32 +19037,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Dobbelt-Noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Dobbelt-Noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Dobbelt-Noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Dobbelt-Noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Dobbelt-Noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Dobbelt-Noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19010,5 +19093,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19531,5 +19614,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "område"
@@ -19665,10 +19748,10 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19814,10 +19897,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20005,28 +20088,24 @@
 "Dette resulterer i feil koordinater."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automatisk nedlasting"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, 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:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20037,65 +20116,69 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Last ned synlige kartbilder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 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:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Last ned kartbilder med feil på nytt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Lagre WMS lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Lagre WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "les inn WMS lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Last inn WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Feil Fil Format"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Feil ved lasting av fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automatisk nedlasting"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20174,5 +20257,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20209,5 +20292,5 @@
 msgstr "Ingen lydenhet tilgjengelig"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20228,5 +20311,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "skog"
@@ -20245,71 +20328,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "grense"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "neste segment"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "Stigning"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Multipolygon"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Nettverk"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "buss-, trikk- og togkart"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Forbud"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "rute"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Sted"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "vannvei"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20589,7 +20662,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Last ned fra OSM langs dette spor"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20807,6 +20879,11 @@
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20815,5 +20892,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20822,5 +20899,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20829,10 +20906,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20843,5 +20920,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20851,5 +20928,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20858,15 +20935,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20875,5 +20952,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21006,5 +21083,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Veinummer"
@@ -21543,5 +21620,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21554,5 +21631,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "skogsområde"
@@ -21856,9 +21933,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "ja"
@@ -21968,9 +22045,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "nei"
@@ -22229,5 +22306,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "boligvei"
@@ -22276,5 +22353,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "adkomstvei"
@@ -22309,5 +22386,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "veiarbeid"
@@ -22394,5 +22471,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "tur"
@@ -22427,5 +22504,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "middels"
@@ -22595,14 +22672,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operatør"
@@ -22870,6 +22947,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Høyde"
@@ -23317,5 +23394,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "myrområde"
@@ -23721,5 +23798,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Spenning"
@@ -24083,31 +24160,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Åpningstider"
@@ -24167,90 +24244,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24363,7 +24440,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Referansenummer"
@@ -24379,5 +24456,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "P-kjeller"
@@ -24390,6 +24467,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Gebyr"
@@ -24565,5 +24642,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Rullestol"
@@ -24600,6 +24677,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Ly"
@@ -24607,5 +24684,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Benk"
@@ -24724,5 +24801,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Fyrlykt"
@@ -24883,5 +24960,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Kjøkken"
@@ -24889,73 +24966,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "gatekjøkken"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "gresk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "lokal"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "meksikansk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Gatekjøkken"
@@ -24963,17 +25045,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Rediger gatekjøkken"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Kafé"
@@ -24981,9 +25063,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Rediger kafé"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub"
@@ -24991,18 +25073,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Rediger pub"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Rediger Biergarten"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar"
@@ -25010,9 +25093,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Rediger bar"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -25020,24 +25103,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Rediger nattklubb"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Rediger attraksjon"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museum"
@@ -25045,9 +25128,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Rediger museum"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -25056,9 +25139,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Rediger  zoologisk hage"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Utsiktspunkt"
@@ -25066,24 +25149,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Utsiktstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Temapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Rediger temapark"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Kunstverk"
@@ -25091,5 +25174,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Rediger kunstverk"
@@ -25097,19 +25180,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Turistinformasjon"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Kart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Karttype"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "Topografisk"
@@ -25147,5 +25230,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25153,28 +25236,28 @@
 msgstr "Gater"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "Diagram"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Synlig område"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "Sted"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "By"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "Region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Nærmere forklaring"
@@ -25184,5 +25267,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Ruter for:"
@@ -25190,5 +25273,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Tursti"
@@ -25196,6 +25279,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Sykling"
@@ -25203,5 +25286,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Fjellsykling"
@@ -25209,6 +25292,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Ski"
@@ -25216,5 +25299,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Riding"
@@ -25222,46 +25305,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "… andre typer transport mulig"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Informasjonstavle"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Tavleinnhold"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "Merknad"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "Historisk"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "Dyreliv"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "Planter"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Veiviser"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Informasjonsterminal"
@@ -25269,29 +25359,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Nærmere beskrivelse"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Lydomviser"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Lydomvisning via mobiltelefon"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Annen informasjon"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Rediger ly"
@@ -25299,25 +25389,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Bålplass"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Piknik-sted"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Rediger piknik-sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Slott"
@@ -25326,19 +25416,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Rediger slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Rediger ruiner"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Arkeologisk plass"
@@ -25347,9 +25437,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Rediger arkeologisk plass"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -25357,10 +25447,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Rediger slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Paleontologisk sted"
@@ -25368,5 +25458,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Rediger paleontologisk sted"
@@ -25374,15 +25464,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Rediger monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -25390,55 +25480,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Rediger veialter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Grensestein"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Rediger grensestein"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Fritid"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Badepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Rediger badepark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Lekeplass"
@@ -25446,35 +25536,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Rediger lekeplass"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Rediger stadion"
@@ -25488,6 +25578,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "velg sport:"
@@ -25903,31 +25993,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "sport"
@@ -25937,240 +26027,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "flerbruk"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "bueskyting"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "turn"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "australsk fotball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "cricketnett"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "sykling"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "hundeløp"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gymnastikk"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "hesteløp"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "skyting"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "skøyter"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "fotball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "svømming"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Sportssenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Rediger sportssenter"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Bane"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Rediger golfbane"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Rediger minigolf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
@@ -26212,23 +26302,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "type"
@@ -26270,211 +26360,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "sportssenter"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Turn"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Rediger motorsport"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
@@ -26482,52 +26572,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Rediger ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "slalom"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "langrenn"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "snøpark"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "begynner"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "enkel"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "vanskelig"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "fristil"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Skyting"
@@ -26535,204 +26625,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Rediger skyting"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golfbane"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Rediger pelota"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Rediger racquet"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Rediger tennis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Menneskeskapt"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Bygning"
@@ -26740,5 +26830,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -26746,10 +26836,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Rediger offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Rådhus"
@@ -26757,10 +26847,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Rediger rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Ambassade"
@@ -26768,10 +26858,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Rediger ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Domstol"
@@ -26780,10 +26870,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Rediger domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Fengsel"
@@ -26792,10 +26882,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Rediger fengsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Politi"
@@ -26805,10 +26895,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Rediger politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -26817,10 +26907,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Rediger brannstasjon"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Postkontor"
@@ -26828,5 +26918,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Rediger postkontor"
@@ -26834,15 +26924,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Rediger barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Skole"
@@ -26850,10 +26940,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Rediger skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Universitet"
@@ -26861,10 +26951,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Rediger universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Høyskole"
@@ -26872,5 +26962,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Rediger høyskole"
@@ -26878,5 +26968,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Kino"
@@ -26885,10 +26975,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Rediger kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Bibliotek"
@@ -26897,9 +26987,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Rediger bibliotek"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Kunstsenter"
@@ -26907,10 +26997,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Rediger kunstsenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Teater"
@@ -26919,10 +27009,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Rediger teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Tilbedelsessted"
@@ -26932,5 +27022,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Rediger tilbedelsessted"
@@ -26939,6 +27029,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religion"
@@ -26947,66 +27037,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "unitarisk"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastrisk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Trosretniing"
@@ -27015,81 +27105,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "Jehovas vitner"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pinsebevegelsen"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbyteriansk"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Adresser"
@@ -27098,5 +27188,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Rediger adresseinformasjon"
@@ -27104,5 +27194,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Husnummer"
@@ -27110,25 +27200,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Gatenavn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "By/sted"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Landskode"
@@ -27137,5 +27227,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Rediger interpolasjon"
@@ -27143,61 +27233,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "oddetall"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "partall"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Menneskeskapt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Rediger tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Høyde (meter)"
@@ -27205,25 +27295,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Rediger vanntårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -27231,10 +27321,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Rediger fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Vindmølle"
@@ -27242,10 +27332,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Rediger vindmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -27254,41 +27344,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Rediger rørledning"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gass"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Område"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Kloakkrenseanlegg"
@@ -27298,10 +27388,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Kran"
@@ -27309,5 +27399,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Rediger kran"
@@ -27315,10 +27405,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
@@ -27326,10 +27416,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -27337,23 +27427,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Rediger overvåkingskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -27363,35 +27453,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Rediger kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "vann"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "atom"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "kull"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "solcelle"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -27400,10 +27490,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Rediger kraftstasjon"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -27412,5 +27502,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Rediger transformatorstasjon"
@@ -27418,10 +27508,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Linjenummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -27432,23 +27522,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Rediger kraftmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Kraftlinje"
@@ -27457,78 +27547,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Rediger kraftlinje"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "Stigning"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "motorway_link"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Fasiliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Toaletter"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "begrenset"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefon"
@@ -27537,5 +27625,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Rediger telefon"
@@ -27543,5 +27631,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Mynter"
@@ -27549,5 +27637,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Sedler"
@@ -27555,5 +27643,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
@@ -27561,5 +27649,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Bankkort"
@@ -27567,15 +27655,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Kredittkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -27584,5 +27672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Rediger returstasjon"
@@ -27590,35 +27678,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Bokser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Klær"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Metall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Søppeldunk"
@@ -27626,5 +27714,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Rediger søppeldunk"
@@ -27633,31 +27721,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Ryggstø"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "stein"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Farge"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "svart"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "brun"
@@ -27736,39 +27824,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "grønn"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "rød"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "blå"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "grå"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "hvit"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Antall seter"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
@@ -27777,30 +27865,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Høyde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Fontene"
@@ -27809,10 +27897,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Rediger fontene"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -27821,10 +27909,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Rediger drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -27833,5 +27921,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Rediger hydrant"
@@ -27839,5 +27927,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Babyboks"
@@ -27845,15 +27933,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Rediger babyboks"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Bilforretning"
@@ -27861,10 +27949,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Rediger bilforretning"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Sykkelforretning"
@@ -27873,28 +27961,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Rediger sykkelforretning"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Hygiene"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Rediger hygiene"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Minimarked"
@@ -27902,9 +27990,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Rediger minimarked"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -27912,27 +28000,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Rediger kiosk"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Bokhandel"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Rediger bokhandel"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Reisebyrå"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Rediger reisebyrå"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Slakter"
@@ -27940,9 +28028,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Rediger slakter"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Baker"
@@ -27950,9 +28038,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Rediger baker"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Blomster"
@@ -27960,18 +28048,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Rediger blomster"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Rediger økologisk"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Sprit og vin"
@@ -27979,54 +28067,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Rediger sprit og vin"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Drikke"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Rediger drikke"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Dataelektronikk"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Rediger dataelektronikk"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Elektronikk"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Rediger elektronikk"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Rediger hifi"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Møbler"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Rediger møbler"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Hagesenter"
@@ -28034,9 +28122,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Rediger hagesenter"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Jernvarehandel"
@@ -28044,9 +28132,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Rediger jernvarehandel"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Byggevare"
@@ -28054,54 +28142,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Rediger byggevare"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Kontor"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Rediger kontor"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Rediger frisør"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Sko"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Rediger sko"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Leker"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Rediger leker"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Rediger video"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Renseri"
@@ -28109,9 +28197,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Rediger renseri"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -28119,9 +28207,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Rediger vaskeri"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Friluftsutstyr"
@@ -28129,24 +28217,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Rediger friluftsutstyr"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Rediger sport"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Rediger optiker"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Automat"
@@ -28154,5 +28242,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Rediger automat"
@@ -28160,97 +28248,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Automatprodukter"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "billetter"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "godter"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "sigaretter"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "fotografier"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "dyremat"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "leker"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "frimerker"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "kuponger"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr "sykkelslanger"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Valuta"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Bank"
@@ -28258,14 +28346,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Rediger bank"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Minibank"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Vekslingssted"
@@ -28273,5 +28361,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Rediger vekslingssted"
@@ -28279,15 +28367,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Rediger minibank"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Helse"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Lege"
@@ -28295,18 +28383,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Rediger lege"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Rediger tannlege"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -28314,5 +28402,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Rediger apotek"
@@ -28320,9 +28408,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Reseptlevering"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Sykehus"
@@ -28330,10 +28418,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Rediger sykehus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -28342,5 +28430,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Rediger redningsmøtepunkt"
@@ -28349,20 +28437,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -28370,5 +28458,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -28377,64 +28465,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Rediger veterinær"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Steder"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Delstat/provins"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Kommune"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Rediger kommune"
@@ -28442,15 +28530,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Storby"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "By"
@@ -28458,10 +28546,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Rediger by"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -28469,25 +28557,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Landsby"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
@@ -28495,5 +28583,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Lokalitet"
@@ -28501,10 +28589,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Øy"
@@ -28512,10 +28600,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Rediger øy"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Holme"
@@ -28523,5 +28611,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Rediger holme"
@@ -28529,5 +28617,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -28535,10 +28623,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Rediger huleinngang"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -28546,10 +28634,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Rediger fjelltopp"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Isbre"
@@ -28557,10 +28645,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Rediger isbre"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Vulkan"
@@ -28568,70 +28656,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Rediger vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Nasjonal"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Rediger nasjonalparkgrense"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Tre"
@@ -28640,15 +28728,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Rediger tre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Skogsområde"
@@ -28657,5 +28745,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Rediger skogsområde"
@@ -28663,17 +28751,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "barskog"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "løvskog"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "blandingsskog"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Skog"
@@ -28682,14 +28770,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Rediger skog"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -28697,25 +28785,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Steinur"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Fjell"
@@ -28723,10 +28811,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Rediger fjell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Beite"
@@ -28734,5 +28822,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Rediger beite"
@@ -28740,5 +28828,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -28747,45 +28835,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -28793,25 +28881,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Hage"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Gress"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Friområde"
@@ -28819,10 +28907,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Offentlig"
@@ -28830,20 +28918,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -28851,5 +28939,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -28857,15 +28945,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -28873,9 +28961,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -28883,39 +28971,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -28923,15 +29011,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Militært"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Rediger militært"
@@ -28939,50 +29027,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
@@ -28992,5 +29080,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -29002,5 +29090,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "ytre linjesegment"
@@ -29008,5 +29096,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -29014,5 +29102,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr "Grense"
@@ -29023,5 +29111,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr "Rediger grense"
@@ -29029,36 +29117,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr "Grensetype"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr "administrativ"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr "nasjonal"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr "kommunegrense"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr "politisk"
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr "Administrativt nivå"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr "Delområde"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr "Administrativt senter"
@@ -29066,5 +29154,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -29073,5 +29161,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -29079,34 +29167,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -29115,15 +29203,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "til linje"
@@ -29131,5 +29219,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Rute"
@@ -29138,5 +29226,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -29144,5 +29232,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Rutetype"
@@ -29250,5 +29338,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29259,17 +29347,17 @@
 msgstr "sykkel"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "vei"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "ferge"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "ski"
@@ -29337,5 +29425,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29345,9 +29433,9 @@
 msgstr "fotgjenger"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "trikk"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "omkjøring"
@@ -29361,10 +29449,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "T-bane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -29372,31 +29460,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Nettverk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Rutetilstand"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "planlagt"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -29405,30 +29493,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "forrige segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
@@ -29655,5 +29743,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "avleggs"
@@ -30306,4 +30394,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30407,11 +30503,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "menneskeskapt"
@@ -30924,5 +31020,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "brygge"
@@ -30936,5 +31032,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "rørgate"
@@ -31078,13 +31174,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "fritid"
@@ -31098,5 +31194,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "marina"
@@ -31192,10 +31288,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "fasilitet"
@@ -31297,10 +31393,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "fasilitet – trafikk"
@@ -31738,24 +31834,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "fasilitet – lys"
@@ -31787,6 +31883,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "små vannsteder"
@@ -31847,8 +31943,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "helse"
@@ -32201,26 +32297,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "butikk"
@@ -32292,8 +32388,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotell"
@@ -32394,9 +32490,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turisme"
@@ -32484,9 +32580,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "historisk"
@@ -32499,5 +32595,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "steinbrudd"
@@ -32511,5 +32607,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "avfallsdeponi"
@@ -32531,5 +32627,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "vannmagasin"
@@ -32543,5 +32639,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "gårdstun"
@@ -32564,5 +32660,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "butikker"
@@ -32576,5 +32672,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "industri"
@@ -32588,5 +32684,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "rivningsområde"
@@ -32600,5 +32696,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "byggeområde"
@@ -32612,5 +32708,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "jernbanegrunn"
@@ -32667,7 +32763,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "militært"
@@ -32681,5 +32777,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "gravlund"
@@ -32692,5 +32788,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "fjelltopp"
@@ -32705,5 +32801,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "isbre"
@@ -32717,5 +32813,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "vulkan"
@@ -32770,8 +32866,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "natur"
@@ -32785,5 +32881,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "krattskog"
@@ -32797,5 +32893,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "beiteområde"
@@ -32809,5 +32905,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "skogsområde"
@@ -32821,5 +32917,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "søle"
@@ -32833,5 +32929,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "strand"
@@ -32909,8 +33005,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "rute"
@@ -32999,12 +33095,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "grense"
@@ -33154,11 +33250,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "sted"
@@ -33172,5 +33268,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "tiger-data"
@@ -33526,6 +33622,11 @@
 msgstr "Sicilia, Italia"
 
-#~ msgid "closedway"
-#~ msgstr "stengt_vei"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Valgt linje inneholder ikke valgt node."
+#~ msgstr[1] "Valgt linje inneholder ikke de valgte nodene."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Grader, minutter, sekunder"
 
 #~ msgid "Move"
@@ -33638,7 +33739,4 @@
 #~ msgstr "annen versjon:"
 
-#~ msgid "resolved version:"
-#~ msgstr "rett versjon"
-
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -33819,7 +33917,4 @@
 #~ msgid "Delete and Download"
 #~ msgstr "Slett og last ned"
-
-#~ msgid "Do not show again"
-#~ msgstr "Ikke vis igjen"
 
 #~ msgid "Add a new tagging preset source to the list."
@@ -34160,7 +34255,4 @@
 #~ msgstr "Last inn TCX filer direkte fra JOSM."
 
-#~ msgid "Boat"
-#~ msgstr "Båt"
-
 #~ msgid "Motorboat"
 #~ msgstr "Motorbåt"
@@ -34222,4 +34314,7 @@
 #~ msgid "Found <nd> element in non-way."
 #~ msgstr "Fant <nd> element i ikke_linje."
+
+#~ msgid "closedway"
+#~ msgstr "stengt_vei"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 22568)
+++ applications/editors/josm/i18n/po/nl.po	(revision 22569)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-21 16:02+0000\n"
-"Last-Translator: Paul Smits <Unknown>\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 12:44+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Dutch <nl@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-07-28 09:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -122,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -160,5 +159,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -234,5 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -248,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -266,11 +265,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -278,20 +278,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -325,5 +325,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Samenvoegen"
@@ -393,5 +393,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -405,5 +405,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -425,4 +425,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -439,6 +440,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -450,5 +451,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -584,22 +585,22 @@
 msgstr "Ophalen open wijzigingensets"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Wegen combineren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Verschillende wegen combineren tot één weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Richting omkeren?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Omkeren en combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -609,5 +610,5 @@
 "de richting van enkele omkeren?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -617,10 +618,10 @@
 "reeks van knopen)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} wegen combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Selecteer twee of meer wegen om te combineren."
@@ -667,10 +668,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -811,5 +812,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -875,10 +876,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Exporteren naar GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "De gegevens naar een GPX-bestand exporteren."
@@ -1074,5 +1075,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1509,20 +1510,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1546,5 +1547,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1555,6 +1556,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Fout"
@@ -1581,5 +1582,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1587,5 +1588,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Huidige gegevens opslaan."
@@ -1642,10 +1643,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Opslaan als..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "De huidige gegevens in een nieuw bestand opslaan."
@@ -1691,5 +1692,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1716,5 +1717,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Neeêh, Niet doen!"
@@ -1785,18 +1786,24 @@
 msgstr[1] "Vereenvoudig weg (verwijder {0} knopen)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Weg splitsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Een weg bij de geselecteerde knoop splitsen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "De huidige selectie kan niet gebruik worden voor splitsen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "De geselecteerde knopen hebben niet dezelfde weg gemeen."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1804,5 +1811,5 @@
 msgstr[1] "De geselecteerde knopen liggen niet in het midden van enige weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1818,21 +1825,11 @@
 "heeft, Selecteer ook de weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "De geselecteerde knopen hebben niet dezelfde weg gemeen."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "De geselecteerde weg bevat niet de geselecteerde knoop."
-msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "Je moet twee of meer knopen selecteren om een rondgaande weg te splitsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1842,5 +1839,5 @@
 "selecteer knopen in het midden van de weg.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1850,5 +1847,5 @@
 "ways.<br>Graag controleren en aanpassen indien nodig.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1858,5 +1855,5 @@
 "<br>Controleer dit en corrigeer dit waar nodig.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2009,5 +2006,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3030,22 +3027,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3192,25 +3189,25 @@
 msgstr "Kan onbepaald conflik niet oplossen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr "Ten minste een te verwijderen object nodig, kreeg lege verzameling"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#, java-format
+msgid "Delete node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#, java-format
+msgid "Delete way {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
-msgid "Delete node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
-#, java-format
-msgid "Delete way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
-#, java-format
 msgid "Delete relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3219,5 +3216,5 @@
 msgstr[1] "Verwijder {0} objecten"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3226,5 +3223,5 @@
 msgstr[1] "Verwijder {0} knooppunten"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3233,5 +3230,5 @@
 msgstr[1] "Verwijder {0} wegen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3240,5 +3237,5 @@
 msgstr[1] "Verwijder {0} relaties"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3391,5 +3388,5 @@
 msgstr "Toepassen?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3465,17 +3462,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Bestanden uit map {0} halen is mislukt\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Kan geen canoniek pad voor map {0} krijgen\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Aanmaken map voor buffergeheugen is mislukt: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3649,42 +3646,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Graden minuten seconden"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "Z"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "W"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3692,5 +3692,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3859,5 +3859,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "achtergrond"
@@ -4001,5 +4001,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr ""
@@ -4027,5 +4027,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "spoorweg"
@@ -4047,6 +4047,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4115,5 +4115,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "gebouw"
@@ -4200,5 +4200,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4301,69 +4301,69 @@
 msgstr "Wachtwoord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "gebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Deze hulptekst tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standaard UNIX-geometrieargument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Het omgrensde gebied downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "De locatie in de URL (met lat=x&lon=y&zoom=z) downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Het omgrensde gebied downloaden als rawe GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Met de opgegeven zoekactie selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Gemaximaliseerd openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "De voorkeuren herstellen op standaardwaarden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4373,9 +4373,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "voorbeelden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4383,46 +4383,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialiseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Vroege plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Standaarden instellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Hoofdscherm aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Oplossen"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4431,5 +4430,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4527,33 +4526,33 @@
 msgstr "Uitzoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "schalen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "De geografische lengtegraad bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "De naam van het object bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "De geografische breedtegraad bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "De hoek tussen het vorige en het huidige wegsegment."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "De (kompas)richting van het lijnsegment dat wordt getekend."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "De lengte van het nieuwe wegsegment dat wordt getekend."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4561,9 +4560,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(geen object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4579,4 +4578,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Toegangsweg"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "Chinese keuken"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Kantoren"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5287,5 +5301,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "alles"
@@ -5368,6 +5382,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5378,5 +5392,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5505,5 +5519,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr ""
@@ -5564,5 +5578,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5725,5 +5739,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5731,5 +5745,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5737,5 +5751,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5743,5 +5757,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5749,5 +5763,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5756,5 +5770,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5762,5 +5776,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5768,5 +5782,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5774,24 +5788,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5871,51 +5885,51 @@
 msgstr "Sluit het venster zonder een nieuwe knoop te maken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Lagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Een lijst met alle geladen lagen openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Zichtbaarheid van een laag in- of uitschakelen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Tonen/Verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Zichtbaarheid van een laag in- of uitschakelen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "De geselecteerde laag een rij omhoog verplaatsen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "De geselecteerde laag een rij omlaag verplaatsen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr ""
@@ -5925,5 +5939,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relaties"
@@ -7078,6 +7092,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7125,107 +7140,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Naam"
@@ -7563,5 +7578,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7648,5 +7663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<verschillend>"
@@ -8377,5 +8392,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8448,8 +8463,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Soort"
@@ -8478,6 +8493,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "onbekend"
@@ -8806,5 +8821,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Conflicten gedetecteerd"
@@ -8876,14 +8891,15 @@
 msgstr "Waarschuwing: fout kop \"{0}\" komt niet overeen met verwacht patroon"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Beschrijf kort de veranderingen die je upload:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Voer je opmerking in"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9314,5 +9330,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9334,5 +9350,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9340,60 +9356,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Aanpassingen uploaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Herstellen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Doorgaan"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Niet meer tonen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9716,103 +9764,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "GPS-punt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Lijntekening aanpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Algemene instellingen gebruiken."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Lijnen tussen punten in deze laag tekenen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Geen lijnen tussen punten in deze laag tekenen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Lijntekenopties selecteren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Kleur aanpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standaard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Kies een kleur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Markers van benoemde punten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Benoemde trackpunten van {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Geluid importeren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-geluidsbestanden (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Geluidsmarkers van {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Afbeeldingen importeren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9820,5 +9776,5 @@
 msgstr "Naam: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9826,5 +9782,5 @@
 msgstr "Beschrijving: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9834,23 +9790,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Beschrijving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Lengte: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9859,5 +9815,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9866,10 +9822,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Naar gegevenslaag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9879,21 +9835,21 @@
 "zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Omgezet van: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9901,10 +9857,10 @@
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Alles downloaden binnen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9912,10 +9868,10 @@
 msgstr "{0} meters"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9923,21 +9879,21 @@
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9949,9 +9905,9 @@
 "verder<br>gaan?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Geen GPX-track in laag beschikbaar om geluid mee te koppelen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9961,5 +9917,5 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9969,23 +9925,115 @@
 "kunnen schatten, zijn overgeslagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Lijntekening aanpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Algemene instellingen gebruiken."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Lijnen tussen punten in deze laag tekenen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Geen lijnen tussen punten in deze laag tekenen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Lijntekenopties selecteren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Kleur aanpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standaard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Kies een kleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Markers van benoemde punten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Benoemde trackpunten van {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Geluid importeren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-geluidsbestanden (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Geluidsmarkers van {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Afbeeldingen importeren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Gegevenslaag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "buiten gedownload gebied"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "versie {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9994,11 +10042,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10007,36 +10055,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} bestaat uit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "API-versie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Naar GPX-laag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10044,5 +10092,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10051,5 +10099,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10057,5 +10105,5 @@
 msgstr[1] "Punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10064,5 +10112,5 @@
 msgstr[1] "Een track met {0} punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10071,5 +10119,5 @@
 msgstr[1] "{0} bestaat uit {1} tracks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10078,24 +10126,28 @@
 msgstr[1] "{0} punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Met GPX relateren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-bestanden (*.gpx, *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Bestand {0} is geladen met de naam \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fout tijdens ontleden {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kan \"{0}\" niet lezen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10107,34 +10159,34 @@
 "een tijdzone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Fototijd (uit exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "GPS-tijd (lees uit de bovenstaande foto): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Ik bevind mij in tijdzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Geen datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Open een andere foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "De tijd met een foto van de GPS-ontvanger synchroniseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10144,93 +10196,93 @@
 "Gebruik de verwachte indeling a.u.b."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Ongeldige datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Nog geen GPX-track geladen>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX-track: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Een ander GPX-spoor openene"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Automatisch schatten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Tijdzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Verschuiving:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Verband tussen afbeeldingen en GPX-tracks leggen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Correleer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Ongeldige tijdzone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Ongeldige verschuiving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10240,20 +10292,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tijdzone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10262,5 +10314,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10268,21 +10320,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Koppelen van foto's aan track is mislukt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Tijdzone en tijdverschil aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "De selecteerde foto''s bevatten geen tijdinformatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Foto''s bevatten geen tijdinformatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10291,17 +10343,17 @@
 "De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX-track heeft geen tijdinformatie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "U mag een GPX-track selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Geen GPX-tracks geselecteerd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10312,5 +10364,5 @@
 "Verwachte indeling: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10321,56 +10373,52 @@
 "Verwachte indeling: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-locaties uit EXIF halen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Mappenscan starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Foto's lezen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lezen {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kan geen canoniek pad voor map {0} krijgen\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Map {0} scannen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Leeg bestand in {0} gevonden\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Bestanden uit map {0} halen is mislukt\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged afbeeldingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Met GPX relateren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10379,5 +10427,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10386,10 +10434,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10398,5 +10446,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10496,9 +10544,9 @@
 msgstr "JPEG-afbeeldingen (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "GPS-marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10506,5 +10554,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10513,14 +10561,26 @@
 msgstr[1] "{0} bestaat uit {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Geen bestaande geluidsmarkers in deze laag om vanaf te verschuiven."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Geluid synchroniseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Pauzeer het geluid op het moment dat je de synchronisatiehulp hoort."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10528,14 +10588,14 @@
 msgstr "Geluid gesynchroniseerd op punt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Kan in de afgespeelde laag niet synchroniseren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Geluidsmarker op afspeelstart zetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10544,16 +10604,4 @@
 "Je moet het geluid gepauzeerd hebben op het punt in de track waar je de "
 "marker wilt hebben."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Geen bestaande geluidsmarkers in deze laag om vanaf te verschuiven."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Zichtbaarheid van de markertekst en pictogrammen in- of uitschakelen."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11414,4 +11462,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Geen"
@@ -11426,5 +11475,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11527,5 +11576,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Alleen interessante richtingwijzers (b.v. met éénrichtingstag)."
@@ -11533,5 +11582,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Alleen op de kop van een weg."
@@ -11561,5 +11610,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Auteur"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Pleziervaart"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11569,9 +11632,9 @@
 "een GPX-laag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11579,9 +11642,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11590,10 +11653,10 @@
 "tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Maximum lengte (meters)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11602,10 +11665,10 @@
 "bevatten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtingspijlen voor lijnen tekenen, de GPS-punten verbindend."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11614,5 +11677,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11621,13 +11684,13 @@
 "Geen pijlen tekenen als  ze niet minstens deze afstand hebben tot de vorige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Minimum afstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "De GPS-punten groter tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11637,9 +11700,9 @@
 "ingesteld in Laagbeheer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Kleur punten en tracksegmenten op basis van snelheid."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11647,28 +11710,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Staat toe om de kleur van de track te variëren naar gemiddelde snelheden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Track- en puntkleuring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "Waypoint-afbeelding"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS-punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Richtingwijzers voor wegsegmenten tekenen."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "De volgordenummers van alle segmenten binnen hun weg tekenen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -11677,10 +11749,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11688,9 +11760,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "De inactieve gegevenslagen in een andere kleur tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM-gegevens"
@@ -12047,21 +12119,26 @@
 msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Projectiemethode"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Coördinaten tonen als"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Projectiemethode"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Laag om in te meten"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Kaartprojectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12605,5 +12682,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12612,49 +12689,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Meer informatie over deze functionaliteit"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Optionele attributen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Onbekend type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12664,15 +12741,15 @@
 msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fout bij ontleden van {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementen van type {0} worden ondersteund."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12682,17 +12759,17 @@
 msgstr[1] "{0} objecten wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Niets geselecteerd!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Selectie is ongeschikt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Voorinstelling toepassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12710,7 +12787,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Zoeken"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12719,17 +12795,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Naar objecten zoeken."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Op selectie inzoomen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Naar objecten zoeken."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13028,5 +13101,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig"
@@ -14469,5 +14542,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14736,5 +14809,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Adresinterpolatie"
@@ -15076,41 +15149,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15127,25 +15200,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15183,18 +15256,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Gebouwen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15355,7 +15428,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
-#, fuzzy
 msgid "Use \"Tableau d''assemblage\""
-msgstr "Tableau d'Assemblage selecteren"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -15419,8 +15491,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "water"
@@ -15481,6 +15553,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "adres"
@@ -15963,34 +16035,34 @@
 "Selecteer er eerst één en probeer dan opnieuw"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Lege laag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-laag ({0}), {1} tegel(s) geladen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Is niet gevectoriseerd."
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr "Is gevectoriseerd."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Omvattende reschthoek gemeente: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16001,14 +16073,14 @@
 "Maak een nieuwe aan."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Fout in bufferstructuur"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr "Fout in buffer Lambert-zone"
@@ -16085,22 +16157,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Object downloaden"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Uit OSM langs deze track downloaden"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Gebied downloaden"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Selecteer tenminste één taak om te downloaden"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16115,7 +16183,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Fout bij ontleden {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16146,9 +16214,9 @@
 msgstr "Weg dupliceren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -16158,5 +16226,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -16165,11 +16233,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Pad van GPX-laag importeren"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Bestaand pad laten vallen"
@@ -16179,5 +16247,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Geen GPX-gegevenslaag gevonden."
@@ -16187,13 +16255,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16435,5 +16503,5 @@
 msgstr "Niet-geotagged foto's tonen"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Afbeeldingen importeren"
@@ -16793,8 +16861,6 @@
 msgstr "Het meetscherm openen."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Herstellen"
@@ -16825,5 +16891,5 @@
 msgstr "Hoek tussen twee geselecteerde knopen"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Laag om in te meten"
@@ -16915,5 +16981,5 @@
 msgstr "Downloadlus van OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugs-onderwerpen tonen"
@@ -16983,13 +17049,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17103,93 +17169,93 @@
 msgstr "Firefox-executable"
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -17231,9 +17297,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17411,20 +17477,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "samengevoegde versie:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "Alle remote-controlopdrachten handmatig bevestigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Een plugin waarmee JOSM door andere applicaties geregeld kan worden."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Afstandsbediening"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Instellingen voor de Afstandsbedieningsplugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17436,51 +17507,59 @@
 "applicaties die met deze plugin communiceren."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Toegestane opdrachten"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Afstandsbediening is gevraagd gegevens uit de API te laden."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Gewenste details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Wil je dit toestaan?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Remote-controlopdracht bevestigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 "Afstandsbediening is gevraagd gegevens te importeren van de volgende URL:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17488,5 +17567,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Terugdraaien"
@@ -17685,41 +17764,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Slippy-kaart"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Tegel laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Alle tegels laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Zoom vergroten"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Zoom verkleinen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -18019,4 +18098,14 @@
 msgid "Terrace"
 msgstr "Terras"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Scheidingsteken"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18703,6 +18792,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18712,9 +18801,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18793,6 +18882,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18800,5 +18889,5 @@
 msgstr "Validatiefouten"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Geen validatiefouten"
@@ -19040,32 +19129,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Dubbele knopen"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Dubbele knopen"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Dubbele knopen"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Dubbele knopen"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Dubbele knopen"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Dubbele knopen"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19102,5 +19185,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -19630,5 +19713,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "gebied"
@@ -19768,10 +19851,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19917,10 +20000,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20109,28 +20192,24 @@
 "Dat kan tot foutieve coördinaten leiden."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automatisch downloaden"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-laag ({0}), in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20141,17 +20220,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Zichtbare tegels downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -20159,48 +20238,52 @@
 "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Foutieve tegels herladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "WMS-laag in bestand opslaan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "WMS-laag uit bestand laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Laden bestand is mislukt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automatisch downloaden"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20280,5 +20363,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20315,5 +20398,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20334,5 +20417,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "bosbouw"
@@ -20351,71 +20434,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "grens"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Metingen"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "Pijplijn"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Multipolygoon"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Netwerk"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "overzichtskaart"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Beperking"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "route"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Plakken"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "waterweg"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20689,7 +20762,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Uit OSM langs deze track downloaden"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20886,6 +20958,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20894,5 +20971,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20901,5 +20978,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20908,10 +20985,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20920,5 +20997,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20928,5 +21005,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20935,15 +21012,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20952,5 +21029,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21083,5 +21160,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Referentie"
@@ -21620,5 +21697,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21631,5 +21708,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "oerbos"
@@ -21933,9 +22010,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "ja"
@@ -22045,9 +22122,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "nee"
@@ -22306,5 +22383,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "woongebied"
@@ -22353,5 +22430,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "toegangsweg"
@@ -22386,5 +22463,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "werkzaamheden"
@@ -22471,5 +22548,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr ""
@@ -22504,5 +22581,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22672,14 +22749,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Bedrijf"
@@ -22947,6 +23024,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Stijging"
@@ -23394,5 +23471,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "moeras"
@@ -23798,5 +23875,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Voltage"
@@ -24160,31 +24237,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Openingstijden"
@@ -24244,90 +24321,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24440,7 +24517,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Referentienummer"
@@ -24456,5 +24533,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "ondergronds"
@@ -24467,6 +24544,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Parkeergeld"
@@ -24642,5 +24719,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Rolstoel"
@@ -24677,6 +24754,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Schuilplaats"
@@ -24684,5 +24761,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Bank"
@@ -24801,5 +24878,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Baken"
@@ -24960,5 +25037,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Keuken"
@@ -24966,73 +25043,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "Italiaanse keuken"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "Chinese keuken"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "Grieks"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "Duits"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "Indiaas"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "lokaal"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "Kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "Turks"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "Oosters"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "Thais"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "Mexicaans"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "Japans"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -25040,17 +25122,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast-Food-restaurant bewerken"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Café"
@@ -25058,9 +25140,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Café bewerken"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Kroeg"
@@ -25068,18 +25150,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Kroeg bewerken"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Biergarten bewerken"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr ""
@@ -25087,9 +25170,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -25097,24 +25180,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Nachtclub bewerken"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Attractie"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Attractie bewerken"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museum"
@@ -25122,9 +25205,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Museum bewerken"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -25133,9 +25216,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Dierentuin bewerken"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -25143,24 +25226,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Themapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Themapart bewerken"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Kunstwerk"
@@ -25168,5 +25251,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Kunstwerk bewerken"
@@ -25174,19 +25257,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -25224,5 +25307,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25230,28 +25313,28 @@
 msgstr "straat"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -25261,5 +25344,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -25267,5 +25350,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Wandelen"
@@ -25273,6 +25356,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Fietsen"
@@ -25280,5 +25363,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -25286,6 +25369,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Skiën"
@@ -25293,5 +25376,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -25299,46 +25382,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "geschiedenis"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "natuur"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "Wild"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25346,29 +25436,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Schuilplaats bewerken"
@@ -25376,25 +25466,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Vuurplaats"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Picnicplek"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Picnicplek bewerken"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Kasteel"
@@ -25403,19 +25493,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Kasteel bewerken"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Archeologische plaats"
@@ -25424,9 +25514,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Archeologische plaats bewerken"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Slagveld"
@@ -25434,10 +25524,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Slagveld bewerken"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25445,5 +25535,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25451,15 +25541,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -25467,55 +25557,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Speelveld"
@@ -25523,35 +25613,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Speelveld bewerken"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -25565,6 +25655,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "sport selecteren:"
@@ -25980,31 +26070,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "sport"
@@ -26014,240 +26104,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "Meervoudig"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "Boogschieten"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "Atletiek"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "Australisch football"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "Honkbal"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "Boules"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "Bowling"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "Kanoën"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "Klimmen"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "Cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "Cricket netten"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "Croquet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "Fietsen"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "Hondenraces"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "Paardensport"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "Turnen"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "Paardenraces"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "Badminton"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "Schieten"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "Skateboarden"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "Schaatsen"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "Skiën"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "Voetbal"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "Zwemmen"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "Tafeltennis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
@@ -26289,23 +26379,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "soort"
@@ -26347,211 +26437,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "Sportveld"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "Sportcentrum"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Paardenracen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Motorracen"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Motorracen bewerken"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
@@ -26559,52 +26649,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Skiën bewerken"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "bergafwaarts"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "Scandinavisch"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "beginner"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "eenvoudig"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Schieten"
@@ -26612,204 +26702,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Schieten bewerken"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golfbaan"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Tennis bewerken"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Gebouw"
@@ -26817,5 +26907,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Openbare gebouw"
@@ -26823,10 +26913,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Openbare gebouwen bewerken"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -26834,10 +26924,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Stadhuis bewerken"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Ambassade"
@@ -26845,10 +26935,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Ambassade bewerken"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -26857,10 +26947,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Gerechtsgebouw bewerken"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Gevangenis"
@@ -26869,10 +26959,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Gevangenis bewerken"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Politie"
@@ -26882,10 +26972,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Politie bewerken"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -26894,10 +26984,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Brandweerkazerne bewerken"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -26905,5 +26995,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Postkantoor bewerken"
@@ -26911,15 +27001,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "School"
@@ -26927,10 +27017,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "School bewerken"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Universiteit"
@@ -26938,10 +27028,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Universiteit bewerken"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Campus"
@@ -26949,5 +27039,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Campus bewerken"
@@ -26955,5 +27045,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -26962,10 +27052,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Bioscoop bewerken"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Bibliotheek"
@@ -26974,9 +27064,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Bibliotheek bewerken"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -26984,10 +27074,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Kunstcentrum bewerken"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Theater"
@@ -26996,10 +27086,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Theater bewerken"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -27009,5 +27099,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Religieus gebouw bewerken"
@@ -27016,6 +27106,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religie"
@@ -27024,66 +27114,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "Bahai"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "Boeddhisme"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "Christelijk"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "Hindoestaans"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "Jain"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "Joods"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "Moslim"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "Spirtualist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "Taoist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Benaming"
@@ -27092,81 +27182,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "Anglicaan"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "Baptist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "Katholiek"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "Evangelist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "Jehovahs getuigen"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "Luthers"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "Methodist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "Mormoon"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "Orthodox"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "Protestant"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "Quaker"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Adressen"
@@ -27175,5 +27265,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Adresinformatie bewerken"
@@ -27181,5 +27271,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Huisnummer"
@@ -27187,25 +27277,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Huisnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Straatnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Stadsnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Landcode"
@@ -27214,5 +27304,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Adresinterpolatie bewerken"
@@ -27220,61 +27310,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "oneven"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Bouwwerken"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Fabriek"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Toren"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -27282,25 +27372,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -27308,10 +27398,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Vuurtoren bewerken"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Windmolen"
@@ -27319,10 +27409,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Windmolen bewerken"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -27331,41 +27421,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Pijplijn bewerken"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Locatie"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -27375,10 +27465,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Afvalzuivering bewerken"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Kraan"
@@ -27386,5 +27476,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Kraan bewerken"
@@ -27392,10 +27482,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Baken bewerken"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -27403,10 +27493,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -27414,23 +27504,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Bewakingscamera bewerken"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -27440,35 +27530,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Energievoorziening bewerken"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "water"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fossiele brandstoffen"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "nucleair"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "kolen"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Verdeelstation"
@@ -27477,10 +27567,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Verdeelstation bewerken"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -27489,5 +27579,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Transformatorstation bewerken"
@@ -27495,10 +27585,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Lijnreferentie"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -27509,23 +27599,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Hoogspanningsmast bewerken"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -27534,78 +27624,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Hoogspanningskabels bewerken"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "Pijplijn"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "op- en afrit autosnelweg"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Voorzieningen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Opmerking"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefoon"
@@ -27614,5 +27702,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Een telefoon bewerken"
@@ -27620,5 +27708,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Munten"
@@ -27626,5 +27714,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Briefgeld"
@@ -27632,5 +27720,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Chipknip"
@@ -27638,5 +27726,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Pinpas"
@@ -27644,15 +27732,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Creditkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Recycling"
@@ -27661,5 +27749,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Recyclebakken"
@@ -27667,35 +27755,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Kleding"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Schroot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27703,5 +27791,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27710,31 +27798,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr ""
@@ -27813,39 +27901,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "groen"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Vogeluitkijkpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
@@ -27854,30 +27942,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Hoogte"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "Kruiphoogte"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "Bukhoogte"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "Stahoogte"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Verborgen"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Afgesloten"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Fontein"
@@ -27886,10 +27974,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Fontein bewerken"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -27898,10 +27986,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Drinkwater bewerken"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -27910,5 +27998,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27916,5 +28004,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr ""
@@ -27922,15 +28010,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -27938,10 +28026,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Winkel met autoonderdelen bewerken"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -27950,28 +28038,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Fietswinkel bewerken"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr ""
@@ -27979,9 +28067,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -27989,27 +28077,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Kiosk bewerken"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Slager"
@@ -28017,9 +28105,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Slager bewerken"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Bakker"
@@ -28027,9 +28115,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Bakker bewerken"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Bloemist"
@@ -28037,18 +28125,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Bloemist bewerken"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr ""
@@ -28056,54 +28144,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Dranken"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Computerwinkel bewerken"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Elektronica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Elektronicawinkel bewerken"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Hifi-winkel bewerken"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Meubels"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Meubelzaak bewerken"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Tuincentrum"
@@ -28111,9 +28199,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Tuincentrum bewerken"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr ""
@@ -28121,9 +28209,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak"
@@ -28131,54 +28219,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak bewerken"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Kantoorartikelen"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Kantoorartikelenwinkel bewerken"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Kapper"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Kapper bewerken"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Schoenen"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Schoenenwinkel bewerken"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Videotheek"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Videotheek bewerken"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Stomerij"
@@ -28186,9 +28274,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Stomerij bewerken"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Wasserette"
@@ -28196,9 +28284,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Wasserette bewerken"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Buitensport"
@@ -28206,24 +28294,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Buitensportzaak bewerken"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Sportzaak bewerken"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Opticiën bewerken"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -28231,5 +28319,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Verkoopautomaat bewerken"
@@ -28237,97 +28325,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Producten"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "overzichtskaart"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "voedsel"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "frisdranken"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "snoepgoed"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "sigaretten"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "foto's"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "diervoeder"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "kranten"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "speelgoed"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "postzegels"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "condooms"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Bank"
@@ -28335,14 +28423,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Bank bewerken"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Geldautomaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -28350,5 +28438,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Geldwisselkantoor bewerken"
@@ -28356,15 +28444,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomaat bewerken"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Gezondheid"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Huisarts"
@@ -28372,18 +28460,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Huisarts bewerken"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -28391,5 +28479,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Apotheek bewerken"
@@ -28397,9 +28485,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -28407,10 +28495,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Ziekenhuis bewerken"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -28419,5 +28507,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "EHBO-post bewerken"
@@ -28426,20 +28514,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
@@ -28447,5 +28535,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -28454,64 +28542,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Dierenarts bewerken"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Locaties"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Land bewerken"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Provincie"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Regio"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr ""
@@ -28519,15 +28607,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Stad"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Stad bewerken"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Dorp"
@@ -28535,10 +28623,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Dorp bewerken"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -28546,25 +28634,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Deelgemeente bewerken"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Klein dorp"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
@@ -28572,5 +28660,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr ""
@@ -28578,10 +28666,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Eiland"
@@ -28589,10 +28677,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Eiland bewerken"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -28600,5 +28688,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -28606,5 +28694,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -28612,10 +28700,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Grotingang bewerken"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Bergtop"
@@ -28623,10 +28711,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Bergtop bewerken"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -28634,10 +28722,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Gletsjer bewerken"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -28645,70 +28733,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Vulkaan bewerken"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Landsgrens"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Grens Nationaal park bewerken"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Boom"
@@ -28717,15 +28805,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Boom bewerken"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Bos"
@@ -28734,5 +28822,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Bos bewerken"
@@ -28740,17 +28828,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "naaldbomen"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "loofbomen"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "gemengd"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Bosbouw"
@@ -28759,14 +28847,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Bosbouw bewerken"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
@@ -28774,25 +28862,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Puinhelling"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Puinhelling bewerken"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Kreupelhout"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Kreupelhout bewerken"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr ""
@@ -28800,10 +28888,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Heide"
@@ -28811,5 +28899,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Heide bewerken"
@@ -28817,5 +28905,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -28824,45 +28912,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Boerenerf bewerken"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Weide"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -28870,25 +28958,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Tuin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -28896,10 +28984,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Stadsgroen bewerken"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Algemeen"
@@ -28907,20 +28995,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Algemeen bewerken"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Park bewerken"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -28928,5 +29016,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Recreatiegebied bewerken"
@@ -28934,15 +29022,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -28950,9 +29038,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -28960,39 +29048,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr ""
@@ -29000,15 +29088,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -29016,50 +29104,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
@@ -29069,5 +29157,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Multipolygoon bewerken"
@@ -29079,5 +29167,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "buitensegment"
@@ -29085,5 +29173,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "binnensegment"
@@ -29091,5 +29179,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -29100,5 +29188,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -29106,36 +29194,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29143,5 +29231,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -29150,5 +29238,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Verkeersbeperking bewerken"
@@ -29156,34 +29244,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "niet keren"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -29192,15 +29280,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "vanaf weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "naar weg"
@@ -29208,5 +29296,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr ""
@@ -29215,5 +29303,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr ""
@@ -29221,5 +29309,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr ""
@@ -29327,5 +29415,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29336,17 +29424,17 @@
 msgstr "fiets"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "straat"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "veerboot"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29414,5 +29502,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29422,9 +29510,9 @@
 msgstr "voet"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "omweg"
@@ -29438,10 +29526,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr ""
@@ -29449,31 +29537,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Netwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "voorgesteld"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "alternatief"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "tijdelijk"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "verbinding"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Kleur (hex)"
@@ -29482,30 +29570,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29732,5 +29820,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "vervallen"
@@ -30383,4 +30471,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30484,11 +30580,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "kunstmatig"
@@ -31001,5 +31097,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "pijler"
@@ -31013,5 +31109,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "pijplijn"
@@ -31155,13 +31251,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "vrije tijd"
@@ -31175,5 +31271,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "jachthaven"
@@ -31269,10 +31365,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "voorziening"
@@ -31374,10 +31470,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "voorziening_verkeer"
@@ -31815,24 +31911,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "voorziening_licht"
@@ -31864,6 +31960,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "licht_water"
@@ -31924,8 +32020,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "gezondheid"
@@ -32278,26 +32374,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "winkel"
@@ -32369,8 +32465,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -32471,9 +32567,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "toerisme"
@@ -32561,9 +32657,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "historisch"
@@ -32576,5 +32672,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "mijnbouw"
@@ -32588,5 +32684,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "vuilstortplaats"
@@ -32608,5 +32704,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "estuarium"
@@ -32620,5 +32716,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "landbouwgrond"
@@ -32641,5 +32737,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "winkelcentrum"
@@ -32653,5 +32749,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "industrieel"
@@ -32665,5 +32761,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "braakliggend gebied"
@@ -32677,5 +32773,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "ontwikkelingsgebied"
@@ -32689,5 +32785,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "Rangeerterrein"
@@ -32744,7 +32840,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "militair gebruik"
@@ -32758,5 +32854,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "begraafplaats"
@@ -32769,5 +32865,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "berg of -heuveltop"
@@ -32782,5 +32878,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "gletsjer"
@@ -32794,5 +32890,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "vulkaan"
@@ -32847,8 +32943,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "Natuurlijk"
@@ -32862,5 +32958,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "ruig land"
@@ -32874,5 +32970,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "heide"
@@ -32886,5 +32982,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "houtland"
@@ -32898,5 +32994,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "slikgronden"
@@ -32910,5 +33006,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "strand"
@@ -32986,8 +33082,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "route"
@@ -33076,12 +33172,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "grens"
@@ -33231,11 +33327,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "plaats"
@@ -33249,5 +33345,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33603,6 +33699,11 @@
 msgstr "Sicilië - Italië"
 
-#~ msgid "closedway"
-#~ msgstr "afgesloten weg"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "De geselecteerde weg bevat niet de geselecteerde knoop."
+#~ msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Graden minuten seconden"
 
 #~ msgid "Select a bookmark first."
@@ -33781,7 +33882,4 @@
 #~ msgid "name"
 #~ msgstr "naam"
-
-#~ msgid "Do not show again"
-#~ msgstr "Niet meer tonen"
 
 #~ msgid "GPS unit timezone (difference to photo)"
@@ -34105,7 +34203,4 @@
 #~ msgstr "Motorboot"
 
-#~ msgid "Boat"
-#~ msgstr "Pleziervaart"
-
 #~ msgid "Bridleway"
 #~ msgstr "Ruiterpad"
@@ -34324,7 +34419,4 @@
 #~ msgid "their version:"
 #~ msgstr "hun versie:"
-
-#~ msgid "resolved version:"
-#~ msgstr "samengevoegde versie:"
 
 #~ msgid "Please select the row to copy."
@@ -34461,4 +34553,7 @@
 #~ msgid "Auto-tag source added:"
 #~ msgstr "Bron auto-tag toegevoegd:"
+
+#~ msgid "closedway"
+#~ msgstr "afgesloten weg"
 
 #~ msgid "Lambert Zone 3 cache file (.3)"
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 22568)
+++ applications/editors/josm/i18n/po/pl.po	(revision 22569)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-24 19:14+0000\n"
-"Last-Translator: Rafał <Unknown>\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 11:29+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-07-28 09:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -27,5 +27,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -56,14 +56,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -80,9 +79,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -125,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -163,5 +162,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -236,5 +235,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -250,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -268,11 +267,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -280,20 +280,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -326,5 +326,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Połącz"
@@ -394,5 +394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -406,5 +406,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -426,4 +426,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -440,6 +441,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -451,5 +452,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -584,22 +585,22 @@
 msgstr "Pobieram otwarte zestawy zmian..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Połącz drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Łączy kilka dróg w jedną."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Zmienić kierunek?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Odwróć i połącz"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -609,5 +610,5 @@
 "zmienić kierunek niektórych dróg?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -617,10 +618,10 @@
 "węzłów)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Połącz {0} dróg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Wybierz co najmniej dwie drogi do połączenia."
@@ -667,10 +668,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -810,5 +811,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -874,10 +875,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Eksportuj do GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Eksportuj dane do pliku GPX"
@@ -1071,5 +1072,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1496,20 +1497,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1533,5 +1534,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1542,6 +1543,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Błąd"
@@ -1568,5 +1569,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1574,5 +1575,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Zapisuje bieżące dane."
@@ -1629,10 +1630,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Zapisuje bieżące dane do nowego pliku."
@@ -1677,5 +1678,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1702,5 +1703,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Nie, przerwij"
@@ -1771,18 +1772,24 @@
 msgstr[2] "Uprość drogę (usuń {0} węzłów)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Rozdziel drogę"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Rozdziela drogę w zaznaczonym węźle."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Wybrane węzły nie współdzielą tej samej trasy."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1791,5 +1798,5 @@
 msgstr[2] "Wybrane węzły nie są w środku żadnej drogi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1802,21 +1809,10 @@
 msgstr[2] "Więcej niż jedna droga używa wybrane węzły. Wybierz także drogę."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Wybrane węzły nie współdzielą tej samej trasy."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Wybrana droga nie zawiera wybranego węzła."
-msgstr[1] "Wybrana droga nie zawiera wszystkich wybranych węzłów."
-msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Musisz wybrać dwa lub więcej węzłów aby rozdzielić drogę okrężną."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1826,5 +1822,5 @@
 "węzły w środku drogi.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1832,5 +1828,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1838,5 +1834,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1986,5 +1982,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2983,22 +2979,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3140,25 +3136,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Usunięto węzeł {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Usunięto drogę {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Usunięto relację {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3168,5 +3164,5 @@
 msgstr[2] "Usunięto {0} objektów"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3176,5 +3172,5 @@
 msgstr[2] "Usunięto {0} węzłów"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3184,5 +3180,5 @@
 msgstr[2] "Usunięto {0} dróg"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3192,5 +3188,5 @@
 msgstr[2] "Usunięto {0} relacji"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3345,5 +3341,5 @@
 msgstr "Zastosować?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3418,7 +3414,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Bład w czasie pobierania obrazów z katalogu {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
@@ -3428,7 +3424,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Błąd w czasie ładowania strony {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3615,42 +3611,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Stopnie minuty sekundy"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "W"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3658,5 +3657,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3831,5 +3830,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "tło"
@@ -3973,5 +3972,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Nie pokazuj ponownie (zapamiętaj wybór)"
@@ -3999,5 +3998,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "tory kolejowe"
@@ -4019,6 +4018,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4088,5 +4087,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "budynek"
@@ -4174,5 +4173,5 @@
 msgstr "Obiekt usunięty"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4267,69 +4266,69 @@
 msgstr "Hasło"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "użycie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opcje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Wyświetl tę pomoc"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Przywróć domyślne ustawienia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Zmień folder dla ustawień wszystkich użytkowników."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4339,9 +4338,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "przykłady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4349,46 +4348,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inicjalizacja"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Ładowanie wczesnych wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Zapisywanie domyślnych ustawień"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Przygotowywanie interfejsu użytkownika"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Ładowanie wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Rozwiąż"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4397,5 +4395,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4491,33 +4489,33 @@
 msgstr "Zmniejsz"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "skala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Długość geograficzna punktu wskazywanego przez kursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Nazwa obiektu wskazywanego przez kursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Szerokość geograficzna punktu wskazywanego przez kursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Kąt pomiędzy poprzednim i bieżącym segmentem tworzonej drogi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Namiar (kompasowy) tworzonego odcinka."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Długość nowego, tworzonego odcinka."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4525,9 +4523,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(brak obiektu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4543,4 +4541,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "droga serwisowa"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "chińska"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "biura i usługi"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5271,5 +5284,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "wszystkie"
@@ -5352,6 +5365,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5363,5 +5376,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5500,5 +5513,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Zestawy zmian"
@@ -5559,5 +5572,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5716,5 +5729,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5722,5 +5735,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5728,5 +5741,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5734,5 +5747,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5740,5 +5753,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5747,5 +5760,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5753,5 +5766,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5759,5 +5772,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5765,24 +5778,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtr aktywny</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> ukrytych obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> wyłączonych obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Zamknij okno filtrów aby zobaczyć wszystkie obiekty.<p></html>"
@@ -5862,51 +5875,51 @@
 msgstr "Zamknij okno, nie twórz nowego węzła"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Warstwy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Otwiera listę wszystkich wczytanych warstw."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Usuń zaznaczoną warstwę."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Zmienia widocznoś zaznaczonej warstwy."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Pokaż/Ukryj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Zmienia widocznoś zaznaczonej warstwy."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Aktywna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Aktywuj zaznzczoną warstwę"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Połącz tą warstwę z inną warstwą"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Skopiuj warstwę"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Przesuwa wybraną warstwę o jedno odczo do dołu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Informacje o warstwie"
@@ -5916,5 +5929,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relacje"
@@ -7070,6 +7083,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7117,107 +7131,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Nazwa"
@@ -7557,5 +7571,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7643,5 +7657,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<różne>"
@@ -8379,5 +8393,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8450,8 +8464,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Rodzaj"
@@ -8480,6 +8494,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "nieznany"
@@ -8803,5 +8817,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Wykryto konflikty"
@@ -8860,14 +8874,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Dołącz krótki opis zmian, które wysyłasz do serwera:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Wpisz swój komentarz"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9301,5 +9316,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Wyślij"
@@ -9321,5 +9336,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9327,60 +9342,93 @@
 msgstr "Ustawienia"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Znaczniki nowego zestawu zmian"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Wyślij zmiany"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Resetuj"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Kontynuuj"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Przechodzi do poprzedniej strony"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Nie pokazuj ponownie"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Anuluj przesyłanie i kontynuuj edytowanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9703,109 +9751,11 @@
 msgstr[2] "{0} obiektów do usunięcia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "punkt GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Dostosuj rysowanie linii"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Użyj ustawień globalnych."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Rysuj linie pomiędzy punktami na tej warstwie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Wybierz opcje rysowania linii"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Dostosuj kolor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Domyślny"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Wybierz kolor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Znaczniki nazwanych punktów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Nazwane punkty GPS z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Importuj dźwięk"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>Dane z warstwy GPX ''{0}'' zostały pobrane z serwera.<br>Z tego powodu "
-"punkty drogi nie zawierają znaczników czasu i niemożliwe jest zestawienie z "
-"nimi dźwięku.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Import nie jest możliwy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Pliki audio Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Markery audio z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importuj obrazki"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html>Dane z warstwy GPX ''{0}'' zostały pobrane z serwera.<br>Z tego powodu "
-"punkty drogi nie zawierają znaczników czasu i niemożliwe jest zestawienie z "
-"nimi obrazków.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9813,5 +9763,5 @@
 msgstr "Nazwa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9819,5 +9769,5 @@
 msgstr "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9828,23 +9778,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Opis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Zakres czasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Długość"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Długość: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9854,5 +9804,5 @@
 msgstr[2] "{0} tras, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9862,10 +9812,10 @@
 msgstr[2] "{0} punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Przekształć w warstwę danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9875,21 +9825,21 @@
 "za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Przekonwertowany z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9897,10 +9847,10 @@
 msgstr "Pobierz dane OSM wzdłuż tej ścieżki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Pobierz wszystko pomiędzy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9908,10 +9858,10 @@
 msgstr "{0} metrów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maksymalny obszar na zapytanie:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9919,21 +9869,21 @@
 msgstr "{0} km kw."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9945,5 +9895,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -9951,5 +9901,5 @@
 "danymi dźwiękowymi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9957,5 +9907,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9963,23 +9913,121 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Dostosuj rysowanie linii"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Użyj ustawień globalnych."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Rysuj linie pomiędzy punktami na tej warstwie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Wybierz opcje rysowania linii"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Dostosuj kolor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Domyślny"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Wybierz kolor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Znaczniki nazwanych punktów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Nazwane punkty GPS z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Importuj dźwięk"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>Dane z warstwy GPX ''{0}'' zostały pobrane z serwera.<br>Z tego powodu "
+"punkty drogi nie zawierają znaczników czasu i niemożliwe jest zestawienie z "
+"nimi dźwięku.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Import nie jest możliwy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Pliki audio Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Markery audio z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importuj obrazki"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>Dane z warstwy GPX ''{0}'' zostały pobrane z serwera.<br>Z tego powodu "
+"punkty drogi nie zawierają znaczników czasu i niemożliwe jest zestawienie z "
+"nimi obrazków.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Warstwa danych {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "poza pobranym obszarem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "wersja {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9989,11 +10037,11 @@
 msgstr[2] "Wykryto {0} konfliktów."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Kliknij aby zamknąć okno i kontynuować edycję"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10002,36 +10050,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "Obiekty na warstwie {0}:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "nieznana"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "Wersja API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Konwertuj na warstwę GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Test zgodności zestawu danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "Nie znaleziono żadnych problemów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Znaleziono następujące problemy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10039,5 +10087,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10046,5 +10094,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10053,5 +10101,5 @@
 msgstr[2] "punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10061,5 +10109,5 @@
 msgstr[2] "trasa z {0} punktami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10069,5 +10117,5 @@
 msgstr[2] "{0} składa się z {1} ścieżek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10077,24 +10125,28 @@
 msgstr[2] "{0} punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Pliki GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Błąd podczas przetwarzania {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nie można odczytać \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10103,34 +10155,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Brak daty"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Otwórz inne zdjęcie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10140,93 +10192,93 @@
 "Proszę użyć wybranego formatu."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Nieprawidłowa data"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "Scieżka GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Strefa czasowa: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Nieprawidłowa strefa czasowa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10236,20 +10288,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10258,5 +10310,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10264,21 +10316,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10286,17 +10338,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10305,5 +10357,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10312,56 +10364,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Pobieranie lokalizacji GPS z EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Wczytywanie {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Przeglądanie katalogu {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Bład w czasie pobierania obrazów z katalogu {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geolokalizowane obrazy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10370,5 +10418,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10377,10 +10425,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10389,5 +10437,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10487,9 +10535,9 @@
 msgstr "Pliki JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "znacznik GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10498,5 +10546,5 @@
 msgstr[2] "znaczników"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10506,14 +10554,26 @@
 msgstr[2] "{0} składa się z {1} markerów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Zmienia widoczność markerów tekstowych i ikon."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Synchronizacja dźwięku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Musisz włączyć pauzę kiedy usłyszysz wskazówkę do synchronizacji."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10521,30 +10581,18 @@
 msgstr "Dźwięk zsynchronizowany w punkcie {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Nie można zsynchronizować aktualnie odtwarzanej warstwy."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Zmienia widoczność markerów tekstowych i ikon."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11388,4 +11436,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "żadne"
@@ -11400,5 +11449,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11501,5 +11550,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "tylko jeżeli mają znaczenie (np.: dla drogi jednokierunkowej)"
@@ -11507,5 +11556,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Tylko na początku drogi."
@@ -11535,5 +11584,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Autor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Diesel (olej napędowy)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Łódka"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11541,9 +11605,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Rysuj linie pomiędzy punktami GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11553,9 +11617,9 @@
 "rysować linie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Maksymalna długość dla plików lokalnych (w metrach)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11564,10 +11628,10 @@
 "rysować linie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Maksymalna długość (w metrach)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11576,10 +11640,10 @@
 "liniach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Oznaczaj kierunek wszystkich odcinków, łączących punkty GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11588,5 +11652,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11594,13 +11658,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Minimalna odległość (w pikselach)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Rysuj większe kropki dla punktów GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11608,9 +11672,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11618,47 +11682,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Pozwana na dostrojenie kolorowania ścieżek dla różnych prędkości średnich."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "Punkty GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rysuje granice obszaru danych pobranych z serwera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Dane OSM"
@@ -12022,21 +12094,25 @@
 "aktywne."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Rodzaj odwzorowania kartograficznego"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Wyświetlaj współrzędne jako"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Rodzaj odwzorowania kartograficznego"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+msgid "System of measurement"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Odwzorowanie kartograficzne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12591,5 +12667,5 @@
 msgstr "Dodaje nowy tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12598,49 +12674,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Więcej informacji na temat tej funkcji"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "Dostępne role"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr "rola"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr "liczba"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr "elementy"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Dodatkowe atrybuty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Nieznany typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12650,15 +12726,15 @@
 msgstr "Nie można odczytać źródła szablonów: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Błąd podczas przetwarzania {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementy typu {0} nie są wspierane."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12669,17 +12745,17 @@
 msgstr[2] "Zmień {0} obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Nic nie wybrano!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Nieodpowiednie zaznaczenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Zastosuj szablon"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12697,7 +12773,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Wyszukuje obiekty"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12706,17 +12781,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Wyszukuje obiekty"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Powiększ do zaznaczenia"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Wyszukuje obiekty"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13015,5 +13087,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Błąd parsowania: błędna struktura dokumentu gpx"
@@ -14481,5 +14553,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14749,5 +14821,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Interpolacja adresów"
@@ -15089,41 +15161,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15140,25 +15212,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Ustaw wielkość budynków"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Szekokość:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15196,18 +15268,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Budynki"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15431,8 +15503,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "woda"
@@ -15493,6 +15565,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "adres"
@@ -15958,34 +16030,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Pusta warstwa"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15994,14 +16066,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -16078,22 +16150,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Pobierz obiekt…"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Pobierz wszystkich członków zaznaczonej relacji"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Pobierz teraz"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Należy wybrać przynajmniej jeden element do pobrania"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16103,12 +16171,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Test {0}/{1}: Rozpoczynanie {2}"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Wczytywanie {0}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16139,9 +16207,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -16151,5 +16219,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -16158,11 +16226,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr ""
@@ -16172,5 +16240,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr ""
@@ -16180,13 +16248,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16425,5 +16493,5 @@
 msgstr ""
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Wczytane obrazy"
@@ -16772,8 +16840,6 @@
 msgstr "Otwiera okno z wynikami pomiarów."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Resetuj"
@@ -16804,5 +16870,5 @@
 msgstr "Kąt pomiędzy dwoma wybranymi węzłami"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr ""
@@ -16894,5 +16960,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Wyświetla problemy z OpenStreetBugs"
@@ -16960,13 +17026,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17080,93 +17146,93 @@
 msgstr "Ścieżka do programu Firefox"
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -17208,9 +17274,9 @@
 msgstr "Nowa warstwa z pliku"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17388,20 +17454,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "Połączona wersja"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17410,50 +17481,58 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17461,5 +17540,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Wycofaj"
@@ -17658,41 +17737,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Mapa \"Slippy\""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -17992,4 +18071,14 @@
 msgid "Terrace"
 msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Separator"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18676,6 +18765,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18685,9 +18774,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18766,6 +18855,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18773,5 +18862,5 @@
 msgstr "Błędy"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Sprawdzanie poprawności przebiegło pomyślnie"
@@ -19013,32 +19102,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Powielone węzły"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Powielone węzły"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Powielone węzły"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Powielone węzły"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Powielone węzły"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Powielone węzły"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19075,5 +19158,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr ""
@@ -19591,5 +19674,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "obszar"
@@ -19726,10 +19809,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19875,10 +19958,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20066,28 +20149,24 @@
 "Może to spowodować powstanie błędnych współrzędnych."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automatyczne pobieranie"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, 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:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20098,65 +20177,69 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Pobierz widoczne kafle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Zmień rozdzielczość"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Wczytaj ponownie błędne kafle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Kanał alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Zapisz warstwę WMS do pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Zapisz plik"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Otwórz warstwę WMS z pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Otwórz warstwę WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Błędny format pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Błąd podczas ładowania pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Ustaw zakładkę WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automatyczne pobieranie"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20235,5 +20318,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20266,5 +20349,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20285,5 +20368,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "las"
@@ -20302,71 +20385,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "granica"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "elementy"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "linia główna"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Utwórz wielokąt złożony"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Sieć"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "mapy komunikacji miejskiej"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Ograniczenie"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "droga"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "miejsce"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "szlak wodny"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20640,7 +20713,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Pobierz dane OSM wzdłuż tej ścieżki"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20839,6 +20911,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20847,5 +20924,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20854,5 +20931,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20861,10 +20938,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20873,5 +20950,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20881,5 +20958,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20890,15 +20967,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20907,5 +20984,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21038,5 +21115,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Numer"
@@ -21575,5 +21652,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "metal"
@@ -21586,5 +21663,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "drewno"
@@ -21888,9 +21965,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "tak"
@@ -22000,9 +22077,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "nie"
@@ -22261,5 +22338,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "droga lokalna"
@@ -22308,5 +22385,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "droga serwisowa"
@@ -22341,5 +22418,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "w budowie"
@@ -22426,5 +22503,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr ""
@@ -22459,5 +22536,5 @@
 msgstr "dobra"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "średnia"
@@ -22627,14 +22704,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operator"
@@ -22902,6 +22979,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Wysokość"
@@ -23349,5 +23426,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "marsze"
@@ -23753,5 +23830,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Napięcie"
@@ -24115,31 +24192,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Godziny otwarcia"
@@ -24199,90 +24276,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24395,7 +24472,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Numer referencyjny"
@@ -24411,5 +24488,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "podziemny"
@@ -24422,6 +24499,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Opłata"
@@ -24597,5 +24674,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Dla niepełnosprawnych"
@@ -24632,6 +24709,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "schronienie"
@@ -24639,5 +24716,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "ławka"
@@ -24756,5 +24833,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "radiolatarnia"
@@ -24915,5 +24992,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Kuchnia"
@@ -24921,73 +24998,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "włoska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "chińska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hamburgery"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "grecka"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "niemiecka"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indyjska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "regionalna"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turecka"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "azjatycka"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "tajska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "meksykańska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japońska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "francuska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "kanapki"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "fast food"
@@ -24995,17 +25077,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Edycja restauracji fast-food"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "ryba z frytkami"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "kurczak"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "kawiarnia"
@@ -25013,9 +25095,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Edycja kawiarni"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "pub"
@@ -25023,18 +25105,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Edycja pubu"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "ogródek piwny"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Edycja ogródka piwnego"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "bar"
@@ -25042,9 +25125,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Edycja baru"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "klub nocny"
@@ -25052,24 +25135,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Edycja klubu nocnego"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turystyka"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "atrakcja"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Edycja atrakcji turystycznej"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "muzeum"
@@ -25077,9 +25160,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Edycja muzeum"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "zoo"
@@ -25088,9 +25171,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Edycja zoo"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "punkt widokowy"
@@ -25098,24 +25181,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Edycja punktu widokowego"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "wieża widokowa"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "park rozrywki"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Edycja parku rozrywki"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "sztuka"
@@ -25123,5 +25206,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Edycja obiektu sztuki"
@@ -25129,19 +25212,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "informacja turystyczna"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Szczegółowość"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "topograficzna"
@@ -25179,5 +25262,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25185,28 +25268,28 @@
 msgstr "ulice"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "schemat"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Obszar"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "miejsce"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "miasto"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Opis"
@@ -25216,5 +25299,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Zaznaczone szlaki:"
@@ -25222,5 +25305,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "turystyka piesza"
@@ -25228,6 +25311,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "kolarstwo"
@@ -25235,5 +25318,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "kolarstwo górskie"
@@ -25241,6 +25324,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "narciarstwo"
@@ -25248,5 +25331,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "jeździectwo"
@@ -25254,46 +25337,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "...możliwe inne rodzaje transportu"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "tablica informacyjna"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Zawartość"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "tablica informacyjna"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "tablica historyczna"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "tablica przyrodnicza"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "tablica o zwierzętach"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "tablica botaniczna"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "drogowskaz"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "słup"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "terminal informacyjny"
@@ -25301,29 +25392,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Opis"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "audioprzewodnik"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Audioprzewodnik dostępny przez telefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Numer telefonu"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "inny punkt informacyjny"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Edycja schronienia"
@@ -25331,25 +25422,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "miejsce na ognisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "miejsce na piknik"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Edycja miejsca na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Miejsca historyczne"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "zamek"
@@ -25358,19 +25449,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Edycja zamku"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "ruiny"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Edycja ruin"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "wykopalisko archeologiczne"
@@ -25379,9 +25470,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Edycja wykopaliska archeologicznego"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "pole bitwy"
@@ -25389,10 +25480,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Edycja pola bitwy"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "wykopalisko paleontologiczne"
@@ -25400,5 +25491,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Edycja wykopaliska paleontologicznego"
@@ -25406,15 +25497,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "pomnik"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Edycja pomnika"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "miejsce pamięci"
@@ -25422,55 +25513,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Edycja miejsca pamięci"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "krzyż przydrożny"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Edycja krzyża przydrożnego"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "kapliczka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Edycja kapliczki"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "kamień graniczny"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Edycja kamienia granicznego"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Rozrywka"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "park wodny"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Edycja parku wodnego"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "plac zabaw"
@@ -25478,35 +25569,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Edycja placu zabaw"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "miejsce do wędkowania"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Edycja miejsca do wędkowania"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Obiekty sportowe"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Edycja stadionu"
@@ -25520,6 +25611,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "wybierz sport:"
@@ -25935,31 +26026,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "Sport"
@@ -25969,240 +26060,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "różne sporty"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "łucznictwo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "lekkoatletyka"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "futbol australijski"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "siatkówka"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "bule"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "gra w kule"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "kajakarstwo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "wspinaczka"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "krykiet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "krykiet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "krokiet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "kolarstwo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "wyścigi psów"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "jazda konna"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gimnastyka"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "wyścigi konne"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "sporty motorowe"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "sport rakietowy"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "strzelectwo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "jazda na deskorolce"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "łyżwiarstwo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "narciarstwo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "piłka nożna"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "pływanie"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "tenis stołowy"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "centrum sportowe"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Edycja centrum sportowego"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "boisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Edycja boiska"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "tor wyścigowy"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Edycja toru wyścigowego"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "pole golfowe"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Edycja pola golfowego"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Edycja minigolfa"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "różne sporty"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Edycja różnych sportów"
@@ -26244,23 +26335,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "rodzaj"
@@ -26302,211 +26393,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "boisko"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "centrum sportowe"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "ścieżka"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "kręgle"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Edycja kręgli"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "lekkoatletyka"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Edycja"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "łucznictwo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "wspinaczka"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "kajakarstwo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "wyścigi psów"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "jeździectwo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "wyścigi konne"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Edycja wyścigów konnych"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "gimnastyka"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Edycja gimnastyki"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "sporty motorowe"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Edycja sportów motorowych"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "łyżwiarstwo"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Edycja łyżwiarstwa"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "jazda na deskorolce"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Edycja jazdy na deskorolce"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "pływanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Edytuj pływanie"
@@ -26514,52 +26605,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Rodzaj trasy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Poziom trudności"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "dla początkujących"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "łatwa"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "dla ekspertów"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "strzelectwo"
@@ -26567,204 +26658,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Sporty z piłką"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "piłka nożna"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "australijski football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "koszykówka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "pole golfowe"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "bule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Edycja boiska do gry w boule"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "gra w kule"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "krykiet"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Edycja boiska do gry w krykieta"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "krykiet - siatki"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Edycja siatek do treningu gry w krykieta"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "krokiet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Edycja miejsca do gry w krokieta"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Edycja miejsca do gry w hokeja"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Edycja miejsca do gry w pelotę"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "tenis stołowy"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Edycja miejsca do gry w tenis stołowy"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Edycja miejsca do gry w tenisa"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Budowle"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "budynek"
@@ -26772,5 +26863,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "budynek użyteczności publicznej"
@@ -26778,10 +26869,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Edycja budynku użyteczności publicznej"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "ratusz"
@@ -26789,10 +26880,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Edycja ratusza"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "ambasada"
@@ -26800,10 +26891,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Edycja ambasady"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "sąd"
@@ -26812,10 +26903,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Edycja siedziby sądu"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "więzienie"
@@ -26824,10 +26915,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Edycja więzienia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "posterunek policji"
@@ -26837,10 +26928,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Edycja posterunku policji"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "straż pożarna"
@@ -26849,10 +26940,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Edycja straży pożarnej"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "poczta"
@@ -26860,5 +26951,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Edycja urzędu pocztowego"
@@ -26866,15 +26957,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "przedszkole"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Edycja przedszkola"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "szkoła"
@@ -26882,10 +26973,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Edycja szkoły"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "uniwersytet"
@@ -26893,10 +26984,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Edycja uniwersytetu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "college"
@@ -26904,5 +26995,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Edycja college'u"
@@ -26910,5 +27001,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "kino"
@@ -26917,10 +27008,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Edycja kina"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "biblioteka"
@@ -26929,9 +27020,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Edycja biblioteki"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "centrum kulturalne"
@@ -26939,10 +27030,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Edycja centrum kulturalnego"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "teatr"
@@ -26951,10 +27042,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Edycja teatru"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "miejsce kultu religijnego"
@@ -26964,5 +27055,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Edycja miejsca kultu religijnego"
@@ -26971,6 +27062,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religia"
@@ -26979,66 +27070,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahaizm"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "buddyzm"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "chrześcijaństwo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hinduizm"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "dżinizm"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "judaizm"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikhizm"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "spirytualizm"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoizm"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zaratusztrianizm"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Wyznanie"
@@ -27047,81 +27138,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "kościół anglikański"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptyści"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "kościół katolicki"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "ewangelikalizm"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "świadkowie Jehowy"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "luteranie"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "metodyści"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormoni"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "kościół prawosławny"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "zielonoświątkowcy"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "prezbiterianie"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestanci"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "kwakrzy"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "szyici"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunnici"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Adresy"
@@ -27130,5 +27221,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Edycja informacji o adresach"
@@ -27136,5 +27227,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Numer domu"
@@ -27142,25 +27233,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Nazwa domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Nazwa ulicy"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Nazwa miejscowości"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Kod pocztowy"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Kod kraju"
@@ -27169,5 +27260,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Edycja interpolacji adresów"
@@ -27175,61 +27266,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Sposób numeracji domów"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "nieparzyste"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "parzyste"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alfabetycznie"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Obiekty sztuczne"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "zakład produkcyjny"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Edycja zakładu produkcyjnego"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "wieża"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Edycja wieży"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Typ wieży"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "komunikacyjna"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "obserwacyjna"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Wysokość (metry)"
@@ -27237,25 +27328,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "wieża ciśnień"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Edycja wieży ciśnień"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "zbiornik gazu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Edycja zbiornika gazu"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "latarnia morska"
@@ -27263,10 +27354,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Edycja latarni morskiej"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "wiatrak"
@@ -27274,10 +27365,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Edycja wiatraka"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "rurociąg"
@@ -27286,41 +27377,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Edycja rurociągu"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gazowy"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "ciepłowniczy"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "naftowy"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "ściekowy"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "różne substancje"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Położenie"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "podwodny"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "nadziemy"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "oczyszczalnia ścieków"
@@ -27330,10 +27421,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Edycja oczyszczalni ścieków"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "dźwig"
@@ -27341,5 +27432,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Edycja dźwigu"
@@ -27347,10 +27438,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Edycja radiolatarni"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "punkt geodezyjny"
@@ -27358,10 +27449,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Edycja punktu geodezyjnego"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "monitoring"
@@ -27369,23 +27460,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Edycja kamery do monitoringu"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "wewnętrzny"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "zewnętrzny"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "publiczny"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "elektrownia"
@@ -27395,35 +27486,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Edycja elektowni"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "wiatrowa"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "wodna"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "cieplna"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "jądrowa"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "węglowa"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "fotowoltaiczna"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "rozdzielnia elektryczna"
@@ -27432,10 +27523,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Edycja rozdzielni elektrycznej"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "stacja transformatorowa"
@@ -27444,5 +27535,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Edycja stacji transformatorowej"
@@ -27450,10 +27541,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Oznaczenie linii"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "słup elektryczny"
@@ -27464,23 +27555,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Edycja słupa elektrycznego"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "wieża"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "słup"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Numer referencyjny"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "linia wysokiego napięcia"
@@ -27489,78 +27580,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Edycja linii wysokiego napięcia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Rodzaj linii"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "linia główna"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "linia boczna"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Liczba kabli"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Liczba przewodów w jednym kablu"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "pojedynczy"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "podwójny"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "potrójny"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "poczwórny"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Udogodnienia"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "toalety"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "limitowane"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Uwagi"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "skrzynka pocztowa"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "telefon"
@@ -27569,5 +27658,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Edycja telefonu"
@@ -27575,5 +27664,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "na monety"
@@ -27581,5 +27670,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "na banknoty"
@@ -27587,5 +27676,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "na karty chipowe"
@@ -27593,5 +27682,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "na karty debetowe"
@@ -27599,15 +27688,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "na karty kredytowe"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "na karty telefoniczne"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "zbiórka odpadów"
@@ -27616,5 +27705,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Edycja punktu zbiórki odpadów"
@@ -27622,35 +27711,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "puszki"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "odzież"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "szkło"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "złom"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "kosz na śmieci"
@@ -27658,5 +27747,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Edycja kosza na śmieci"
@@ -27665,31 +27754,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Oparcie"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Materiał"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "kamień"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plastik"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Kolor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "czarny"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "brązowy"
@@ -27768,39 +27857,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "zielony"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "czerwony"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "niebieski"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "szary"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "biały"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Pojemność"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Ambona myśliwska"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Edycja ambony strzelniczej"
@@ -27809,30 +27898,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Wysokość"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "niska"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "połowiczna"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "pełna"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Ukryj"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Zablokuj"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "fontanna"
@@ -27841,10 +27930,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Edycja fontanny"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "woda do picia"
@@ -27853,10 +27942,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Edycja punktu z wodą pitną"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "hydrant"
@@ -27865,5 +27954,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Edycja hydrantu"
@@ -27871,5 +27960,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "okno życia"
@@ -27877,15 +27966,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Edycja okna życia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Sklepy"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "dealer samochodowy"
@@ -27893,10 +27982,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Edycja warsztatu samochodowego"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "sklep rowerowy"
@@ -27905,28 +27994,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Edycja warsztatu rowerowego"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Edycja supermarketu"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "drogeria"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Edycja drogerii"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "sklep osiedlowy"
@@ -27934,9 +28023,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Edycja sklepu osiedlowego"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "kiosk"
@@ -27944,27 +28033,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Edycja kiosku"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "księgarnia"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Edycja księgarni"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "biuro podróży"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Edycja biura podróży"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "rzeźnik"
@@ -27972,9 +28061,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Edycja sklepu mięsnego"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "piekarnia"
@@ -27982,9 +28071,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Edycja piekarni"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "kwiaciarnia"
@@ -27992,18 +28081,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Edycja kwiaciarni"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "naturalna żywność"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Edycja sklepu z naturalną żywnością"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "sklep monopolowy"
@@ -28011,54 +28100,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Edycja sklepu monopolowego"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "sklep z napojami"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Edycja sklepu z napojami"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "sklep komputerowy"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Edycja sklepu komputerowego"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "sklep elektroniczny"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Edycja sklepu elektronicznego"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "sprzęt hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Edycja sklepu ze sprzętem hi-fi"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "meble"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Edycja sklepu meblowego"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "centrum ogrodnicze"
@@ -28066,9 +28155,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Edycja centrum ogrodniczego"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "sklep z narzędziami"
@@ -28076,9 +28165,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Edycja sklepu z narzędziami"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "sklep DIY"
@@ -28086,54 +28175,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Edycja sklepu DIY (zrób to sam)"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "artykuły biurowe"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Edycja sklepu z artykułami biurowymi"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "fryzjer"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Edycja salonu fryzjerskiego"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "obuwniczy"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Edycja sklepu obuwniczego"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "zabawki"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Edycja sklepu z zabawkami"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "wypożyczalnia wideo"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Edycja wypożyczalni wideo"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "pralnia chemiczna"
@@ -28141,9 +28230,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Edycja palni chemicznej"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "pralnia samoobsługowa"
@@ -28151,9 +28240,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "wyspa"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "sklep turystyczny"
@@ -28161,24 +28250,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Edycja sklepu ze sprzętem turystycznym"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Edycja sklepu sportowego"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "optyk"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Edycja optyka"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "automat sprzedający"
@@ -28186,5 +28275,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Edycja automatu sprzedającego"
@@ -28192,97 +28281,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Sprzedawane produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "bilety komunikacji miejskiej"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "mapy komunikacji miejskiej"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "bilety parkingowe"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "jedzenie"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "napoje"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "słodycze"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "papierosy"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "zdjęcia"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "jedzenie dla zwierząt"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "gazety"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "zabawki"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "znaczki"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "karty SIM"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "vouchery"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "prezerwatywy"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampony"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "torby na odchody"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Gotówka"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "bank"
@@ -28290,14 +28379,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Edycja banku"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "kantor"
@@ -28305,5 +28394,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Edycja kantoru"
@@ -28311,15 +28400,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Edycja bankomatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Zdrowie"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "lekarz"
@@ -28327,18 +28416,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Edycja lekarza"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "dentysta"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Edycja dentysty"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "apteka"
@@ -28346,5 +28435,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Edycja apteki"
@@ -28352,9 +28441,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "realizacja recept"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "szpital"
@@ -28362,10 +28451,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Edycja szpitala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr ""
@@ -28374,5 +28463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28381,20 +28470,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Numer punktu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Numer telefonu"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)"
@@ -28402,5 +28491,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "weterynarz"
@@ -28409,64 +28498,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Edycja lecznicy weterynaryjnej"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Miejsca"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "kontynent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Edycja kontynentu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "kraj"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Edycja kraju"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "stan"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Edycja stanu"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Edycja regionu"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "okręg"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Edycja okręgu / hrabstwa"
@@ -28474,15 +28563,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "miasto"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Edycja miasta"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "małe miasto"
@@ -28490,10 +28579,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Edycja miejscowości"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "dzielnica"
@@ -28501,25 +28590,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Edycja dzielnicy"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "wieś"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Edycja wsi"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "przysiółek"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Edycja wólki"
@@ -28527,5 +28616,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "okolica"
@@ -28533,10 +28622,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Edycja okolicy"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "wyspa"
@@ -28544,10 +28633,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Edycja wyspy"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "wysepka"
@@ -28555,5 +28644,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Edycja wysepki"
@@ -28561,5 +28650,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "wejście do jaskini"
@@ -28567,10 +28656,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Edycja wejścia do jaskini"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "wzgórze"
@@ -28578,10 +28667,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Edycja wzgórza"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "lodowiec"
@@ -28589,10 +28678,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Edycja lodowca"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "wulkan"
@@ -28600,70 +28689,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Edycja wulkanu"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Granice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "narodowa"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Edycja granicy narodowej"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "administracyjna"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Edycja granicy administracyjnej"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "cywilna"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Edycja granicy cywilnej"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "polityczna"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Edycja granicy politycznej"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "park narodowy"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Edycja granicy parku narodowego"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Zagospodarowanie terenu"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "drzewo"
@@ -28672,15 +28761,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Edycja drzewa"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Nazwa systematyczna"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "las pierwotny"
@@ -28689,5 +28778,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Edycja lasu pierwotnego"
@@ -28695,17 +28784,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "iglasty"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "liściasty"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "mieszany"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "las"
@@ -28714,14 +28803,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Edycja lasu"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "rezerwat przyrody"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Edycja rezerwatu przyrody"
@@ -28729,25 +28818,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "rumowisko"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Edycja rumowiska"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "busz"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Edycja buszu"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "hala górska"
@@ -28755,10 +28844,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Edycji hali górskiej"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "wrzosowisko"
@@ -28766,5 +28855,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Edycja wrzosowiska"
@@ -28772,5 +28861,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "zagroda"
@@ -28779,45 +28868,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Edycja zagrody"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "grunty rolne"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Edycja gruntów rolnych"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "łąka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Edycja łąki"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "winnica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Edycja winnicy"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "ogródki działkowe"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Edycja ogródków działkowych"
@@ -28825,25 +28914,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "ogród"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Edycja ogrodu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "trawa"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "zieleń miejska"
@@ -28851,10 +28940,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Edycja zieleni miejskiej"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "miejsce publiczne"
@@ -28862,20 +28951,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Edycja miejsca publicznego"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Edycja parku"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "teren rekreacyjny"
@@ -28883,5 +28972,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edycja terenu rekreacyjnego"
@@ -28889,15 +28978,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "zabudowa mieszkaniowa"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Edycja zabudowy mieszkaniowej"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "cmentarz"
@@ -28905,9 +28994,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "cmentarz"
@@ -28915,39 +29004,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "handel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Edycja obszaru handlowego"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "biura i usługi"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Edycja obszaru biur i usług"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "teren przemysłowy"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Edycja terenu przemysłowego"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Teren kolejowy"
@@ -28955,15 +29044,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Edycja terenu kolejowego"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Obszar wojskowy"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Edycja obszaru wojskowego"
@@ -28971,50 +29060,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Budowa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Edycja terenu budowy"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "teren poprzemysłowy"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Edycja terenu poprzemysłowego"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Teren pod zabudowę"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Edycja terenu pod zabudowę"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Wysypisko"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Edycja wysypiska śmieci"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "kamieniołom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Edycja komieniołomu"
@@ -29024,5 +29113,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Edycja multipolygonu"
@@ -29034,5 +29123,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "Zewnętrzny segment"
@@ -29040,5 +29129,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "Wewnętrzny segment"
@@ -29046,5 +29135,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr "granica"
@@ -29055,5 +29144,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr "Edycja granicy"
@@ -29061,36 +29150,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr "Rodzaj granicy"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr "administracyjna"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr "narodowa"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr "cywilna"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr "polityczna"
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr "Poziom administracyjny"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr "Podobszary"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr "Centrum administracyjne"
@@ -29098,5 +29187,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "ograniczenia skrętu"
@@ -29105,5 +29194,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Edycja ograniczenia skrętu"
@@ -29111,34 +29200,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Ograniczenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "zakaz skrętu w lewo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "zakaz skrętu w prawo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "zakaz jazdy prosto"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "zakaz zawracania"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "nakaz skrętu w prawo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "nakaz skrętu w lewo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "nakaz jazdy prosto"
@@ -29147,15 +29236,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "z drogi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "przez węzeł lub drogę"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "do drogi"
@@ -29163,5 +29252,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "trasa"
@@ -29170,5 +29259,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Edytuj trasę"
@@ -29176,5 +29265,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Typ trasy"
@@ -29282,5 +29371,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29291,17 +29380,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "droga"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "prom"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29369,5 +29458,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29377,9 +29466,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "objazd"
@@ -29393,10 +29482,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Opis symboli"
@@ -29404,31 +29493,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Sieć"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "proponowany"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "alternatywny"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "tymczasowy"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "połaczenie"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Kolor (hex)"
@@ -29437,30 +29526,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29687,5 +29776,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "przestarzały"
@@ -30338,4 +30427,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30439,11 +30536,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr ""
@@ -30956,5 +31053,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "nabrzeże"
@@ -30968,5 +31065,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr ""
@@ -31110,13 +31207,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "wypoczynek"
@@ -31130,5 +31227,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "marina"
@@ -31224,10 +31321,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "udogodnienie"
@@ -31329,10 +31426,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -31770,24 +31867,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -31819,6 +31916,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -31879,8 +31976,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "zdrowie"
@@ -32233,26 +32330,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "sklep"
@@ -32324,8 +32421,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -32426,9 +32523,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turystyka"
@@ -32516,9 +32613,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "historia"
@@ -32531,5 +32628,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "kamieniołom"
@@ -32543,5 +32640,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "Wysypisko smieci"
@@ -32563,5 +32660,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "Basen"
@@ -32575,5 +32672,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "Gospodarstwo"
@@ -32596,5 +32693,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr ""
@@ -32608,5 +32705,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "Teren przemysłowy"
@@ -32620,5 +32717,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "teren poprzemysłowy"
@@ -32632,5 +32729,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr ""
@@ -32644,5 +32741,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "Teren kolejowy"
@@ -32699,7 +32796,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "Teren wojskowy"
@@ -32713,5 +32810,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "Cmentarz"
@@ -32724,5 +32821,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "Szczyt"
@@ -32737,5 +32834,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "Lodowiec"
@@ -32749,5 +32846,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "Wulkan"
@@ -32802,8 +32899,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr ""
@@ -32817,5 +32914,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "Zarośla"
@@ -32829,5 +32926,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "Zdrowie"
@@ -32841,5 +32938,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -32853,5 +32950,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "Błoto"
@@ -32865,5 +32962,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "Plaża"
@@ -32941,8 +33038,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "droga"
@@ -33031,12 +33128,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "granica"
@@ -33186,11 +33283,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "Miejsce"
@@ -33204,5 +33301,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33558,6 +33655,12 @@
 msgstr "Sycylia - Włochy"
 
-#~ msgid "closedway"
-#~ msgstr "zamknięta droga"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Wybrana droga nie zawiera wybranego węzła."
+#~ msgstr[1] "Wybrana droga nie zawiera wszystkich wybranych węzłów."
+#~ msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Stopnie minuty sekundy"
 
 #~ msgid "Move"
@@ -33608,7 +33711,4 @@
 #~ msgid "Data Layer"
 #~ msgstr "Warstwa danych"
-
-#~ msgid "Do not show again"
-#~ msgstr "Nie pokazuj ponownie"
 
 #~ msgid "Error while parsing"
@@ -33689,7 +33789,4 @@
 #~ msgid "Motorboat"
 #~ msgstr "Motorówka"
-
-#~ msgid "Boat"
-#~ msgstr "Łódka"
 
 #~ msgid "Bridleway"
@@ -34105,4 +34202,7 @@
 #~ msgid "Occupied By"
 #~ msgstr "Zajęte przez"
+
+#~ msgid "closedway"
+#~ msgstr "zamknięta droga"
 
 #~ msgid "Click Reload to refresh list"
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 22568)
+++ applications/editors/josm/i18n/po/pt_BR.po	(revision 22569)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-28 03:08+0000\n"
-"Last-Translator: Guilherme Donadel <Unknown>\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-08-02 17:05+0000\n"
+"Last-Translator: Rodrigo de Avila <rodrigo@avila.net.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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-07-28 09:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -122,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -160,5 +159,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -235,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -249,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -267,11 +266,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -279,20 +279,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -325,5 +325,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Combinar"
@@ -393,5 +393,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -405,5 +405,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -425,4 +425,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -439,6 +440,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -450,5 +451,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -583,22 +584,22 @@
 msgstr "Baixando conjuntos de modificações abertos ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Combinar Caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Combinar vários caminho em um só"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Inverter direções?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Inverter e Combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -608,5 +609,5 @@
 "algum destes?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -616,10 +617,10 @@
 "único conjunto de nós)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Por favor selecione no mínimo 2 caminhos a combinar"
@@ -666,10 +667,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -809,5 +810,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -873,10 +874,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Exportar para GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Exportar dados para arquivo GPX."
@@ -1069,5 +1070,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1509,20 +1510,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1546,5 +1547,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1555,6 +1556,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Erro"
@@ -1581,5 +1582,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1587,5 +1588,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Salvar dados atuais"
@@ -1642,10 +1643,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Salvar como..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Salvar os dados atuais para um novo arquivo."
@@ -1691,5 +1692,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1716,5 +1717,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Não, abortar"
@@ -1783,18 +1784,24 @@
 msgstr[1] "Simplificar caminho (remover {0} nós)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Dividir Caminho"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Dividir caminho no nó selecionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "A seleção atual não pode ser usada para divisões"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Os nós selecionados não compartilham o mesmo caminho."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1802,5 +1809,5 @@
 msgstr[1] "Os nós selecionados não se encontram no meio de nenhum caminho"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1816,21 +1823,11 @@
 "o caminho também."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Os nós selecionados não compartilham o mesmo caminho."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "O caminho selecionado não contém o nó selecionado."
-msgstr[1] "O caminho selecionado não contém todos nós selecionados."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "Você precisa selecionar dois ou mais nós para dividir um caminho circular."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1840,5 +1837,5 @@
 "no meio do caminho.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1848,5 +1845,5 @@
 "caminhos novos.<br>Deverá verificar isto e corrigir quando necessário.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1856,5 +1853,5 @@
 "<br>Deverá verificar isto e corrigir quando necessário.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2005,5 +2002,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3041,22 +3038,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3203,26 +3200,26 @@
 msgstr "não foi possível resolver conflito não-definido"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 "Ao menos um objeto para apagar é requirido, mas foi obtido coleção vazia"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Apagar nó {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Apagar caminho {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Apagar relação {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3231,5 +3228,5 @@
 msgstr[1] "Apagar {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3238,5 +3235,5 @@
 msgstr[1] "Apagar {0} nós"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3245,5 +3242,5 @@
 msgstr[1] "Apagar {0} caminhos"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3252,5 +3249,5 @@
 msgstr[1] "apagar {0} relação"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3408,5 +3405,5 @@
 msgstr "Aplicar?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3474,9 +3471,11 @@
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
+"Não foi possível criar o diretório {0}, o salvamento automático será "
+"desabilitado"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
-msgstr ""
+msgstr "Não foi possível criar o arquivo {0}, outro nome de arquivo será usado"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
@@ -3484,19 +3483,21 @@
 msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr ""
+"Erro de entrada e saída ao criar o arquivo, o salvamento automático será "
+"ignorado: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
 #, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr ""
+msgstr "Não foi possível remover o arquivo de segurança antigo {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Erro ao carregar página {0}"
+msgstr "Erro ao criar o backup da camada removida: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
-msgstr ""
+msgstr "Não foi possível ler os dados osm salvados automaticamente ({0}) - {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
@@ -3687,42 +3688,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Graus Minutos Segundos"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Coordenadas de Projeto"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "O"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "L"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3732,5 +3736,5 @@
 "incluída"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3913,5 +3917,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "segundo plano"
@@ -4058,5 +4062,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Não mostrar novamente (lembrar escolha)"
@@ -4084,5 +4088,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "ferrovia"
@@ -4104,6 +4108,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4172,5 +4176,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "prédio"
@@ -4257,5 +4261,5 @@
 msgstr "Objeto apagado"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4357,29 +4361,29 @@
 msgstr "Senha"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opções"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Mostar essa ajuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Argumento padrão de geometria unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Baixar o retângulo limite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4387,41 +4391,41 @@
 "Abrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Baixar o retângulo limite como dados de gps brutos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z) como dados raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Selecionar dentro da busca"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Executar em modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Resetar preferência para default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Definir o idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "opções providas como propriedades do sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/TRILHA/PARA/PASTA/DO/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Alterar o diretório para todas as configurações de usuário"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4435,9 +4439,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4447,46 +4451,45 @@
 "ordem."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Tenha certeza de que irá carregar algum dado, caso use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inicializando"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Atualizando plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Instalando plugins atualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Carregando plugins anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Aplicando padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Criando tela principal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Carregando plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+msgstr "Dado osm não salvo"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Resolver"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr "Restaurar"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4494,6 +4497,8 @@
 "time. Do you want to restore data?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+"JOSM encontrado {0} camadas de dados osm não salvos. Possivelmente o JOSM "
+"caiu na última vez. Você quer restaurar os dados?"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4589,33 +4594,33 @@
 msgstr "Diminuir zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "escala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "A lontigute geográfica na posição do ponteiro do mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "O nome do objeto na posição do ponteiro do mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "A latitude geográfica na posição do ponteiro do mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "O ângulo entre o segmento anterior e o atual."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "A direção (bússola) do segmento de linha que está sendo desenhado."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "O comprimento do novo caminho que está sendo desenhado."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4625,9 +4630,9 @@
 "diretamente dessa lista com o mouse.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(nenhum objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4643,4 +4648,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Camada ''{0}'' precisa estar na lista de camadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Numérico"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "chinessa"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Comercial"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5397,5 +5417,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "todos os números"
@@ -5479,6 +5499,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5489,5 +5509,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5638,5 +5658,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Conjuntos de modificações"
@@ -5703,5 +5723,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5870,5 +5890,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5876,5 +5896,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5882,5 +5902,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5888,5 +5908,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5894,5 +5914,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5901,5 +5921,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5907,5 +5927,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5913,5 +5933,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5919,24 +5939,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Filtro ativo</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> objetos escondidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> objetos desabilitados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Feche a janela de filtros para ver todos objetos.<p></html>"
@@ -6016,51 +6036,51 @@
 msgstr "Feche a janela de diálogo, não crie um novo nó"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Camadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Abrir uma lista com camadas carregadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Apagar camadas selecionadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Mudar estado de visibilidade do layer selecionado."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Mostrar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Mudar estado de visibilidade do layer selecionado."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Ativar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Ativar camada selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Combinar esta camada em outra camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Duplicar esta camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Mover a camada selecionada uma linha acima."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Mover camada selecionada uma linha abaixo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Informação sobre camada"
@@ -6070,5 +6090,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relações"
@@ -7238,6 +7258,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7285,107 +7306,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Nome"
@@ -7777,5 +7798,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7868,5 +7889,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<diferente>"
@@ -8361,4 +8382,6 @@
 "current layer"
 msgstr ""
+"Os itens que você deseja colar não podem ser adicionados porque eles não "
+"estão incluídos na camada atual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
@@ -8639,5 +8662,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Limites"
@@ -8710,8 +8733,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Tipo"
@@ -8740,6 +8763,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "Desconhecido"
@@ -9095,5 +9118,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Conflitos detectados"
@@ -9164,14 +9187,15 @@
 msgstr "Aviso: o cabeçalho de erro {0} não é compatível com o padrão esperado"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Faça um comentário breve sobre as mudanças que está enviando:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Digite um comentário de envio (mín. de 3 caracteres)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Comentário de envio inválido"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "ID do chengeset:"
@@ -9648,5 +9672,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Enviar"
@@ -9668,5 +9692,5 @@
 msgstr "Inicializando relações a atualizar..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9674,18 +9698,18 @@
 msgstr "Configurações"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "Decidir como enviar os dados e que changeset usar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Etiquetas para novo conjunto de modificações"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Aplicar tags ao changeset para o qual os dados são enviados"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
@@ -9693,45 +9717,77 @@
 "modificações para enviar os dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Configurar definições avançadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Enviar para ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Enviar Modificações"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Enviar primitivas modificadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-"Por gentile digite um comentário para este conjunto de mudanças (mínomo 3 "
-"caracteres)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Comentário de envio inválido"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Inverter"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Continuar"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Clique para voltar para Diálogo de Envio"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Não mostrar novamente"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Por favor, entre com valor válido para tamanho de pedaço de arquivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Tamanho do bloco é ilegal"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Cancelar o upload e continuar a editar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9746,4 +9802,6 @@
 "primitive and retrying to upload."
 msgstr ""
+"Aviso: primitiva \"{0}\" já está excluída do servidor. Ignorando esta "
+"primitiva e repetindo o upload."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
@@ -9761,4 +9819,6 @@
 "comment ''{1}''."
 msgstr ""
+"Os objetos são carregados para o <strong>conjunto de modificações aberto</"
+"strong> {0}, com o comentário de carregamento \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
@@ -9873,4 +9933,7 @@
 "on the server ''{1}''."
 msgstr ""
+"O servidor relatou que o conjunto de modificações atual foi encerrado."
+"<br>Isso geralmente acontece porque o tamanho do conjunto de modificações "
+"excedeu o limite máximo<br> de {0} objetos no servidor \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:107
@@ -9935,4 +9998,6 @@
 "be uploaded to the server.</html>"
 msgstr ""
+"<html>Marque os objetos modificados <strong>da seleção atual</strong> para "
+"serem carregados no servidor.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70
@@ -9941,4 +10006,6 @@
 "server.</html>"
 msgstr ""
+"<html>Marque <strong> os objetos removidos localmente</strong> para serem "
+"removidos do servidor.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112
@@ -10036,5 +10103,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411
 msgid "Illegal chunk size <= 0. Please enter an integer > 1"
-msgstr ""
+msgstr "Tamanho do pedaço ilegal <= 0. Por favor insira um inteiro > 1"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413
@@ -10043,4 +10110,6 @@
 msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
 msgstr ""
+"O tamanho do pedaço {0} excede o tamanho máximo do conjunto de modificações "
+"{1} do servidor \"{2}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415
@@ -10086,103 +10155,11 @@
 msgstr[1] "{0} objetos a acrescentar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "ponto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Personalizar linha"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Usar preferências globais."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Desenhar linhas entre pontos para esta camada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Não desenhar linhas entre pontos para esta camada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Selecionar opções de linha"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Personalizar cores"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Padrão"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Selecionar uma cor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Marcadores de Pontos Nomeados"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Trackpoints nomeados de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Importar Áudio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Importação não possível"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Árquivos de Áudio WAV (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcadores de audio de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importar imagens"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10190,5 +10167,5 @@
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10196,5 +10173,5 @@
 msgstr "Descrição: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10204,23 +10181,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Descrição"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Vigência"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Comprimento"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Comprimento: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10229,5 +10206,5 @@
 msgstr[1] "{0} rotas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10236,10 +10213,10 @@
 msgstr[1] "{0} pontos da via"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Converter para camada de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10249,21 +10226,21 @@
 "arriscado.<br> Se quiser enviar dados, consulte aqui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10271,10 +10248,10 @@
 msgstr "Descarregar do OSM ao largo desta via"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Descargar tudo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10282,10 +10259,10 @@
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Área máxima por pedio:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10293,21 +10270,21 @@
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr "Baixar próximo:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr "somente trilha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr "somente pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr "trilhas e pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10319,39 +10296,140 @@
 "Você deseja </br> continuar? </html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Não há trilha GPX disponível na camada para associar áudio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
 "the end were omitted or moved to the start."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+"Alguns pontos de interesse com o tempo anterior ao início da trilha, ou "
+"posterior ao final, foram omitidos ou movidos para o começo."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
 "time were omitted."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+"Alguns pontos de interesse que ficaram muito longe da trilha foram omitidos."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Personalizar linha"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Usar preferências globais."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Desenhar linhas entre pontos para esta camada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Não desenhar linhas entre pontos para esta camada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Selecionar opções de linha"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Personalizar cores"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Padrão"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Selecionar uma cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Marcadores de Pontos Nomeados"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Trackpoints nomeados de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Importar Áudio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>O dado na camada GPX \"{0}\" foi baixado do servidor.<br>Porque os "
+"seus pontos não incluem dados de tempo, dessa forma não podemos "
+"correlacionar os pontos com os dados de audio.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Importação não possível"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Árquivos de Áudio WAV (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcadores de audio de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importar imagens"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>O dado na camada GPX \"{0}\" foi baixado do servidor.<br>Porque os "
+"seus pontos não incluem dados de tempo, dessa forma não podemos "
+"correlacionar os pontos com as imagens.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Camada de dados {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "fora da área baixada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "versão {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Atenção: misturando dados de versões 0.6 e 0.5 na versão 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10360,11 +10438,11 @@
 msgstr[1] "Houve {0} conflitos detectados."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Clique para fechar essa janela e continuar editando"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10373,42 +10451,45 @@
 msgstr[1] "{0} removidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consiste em:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "remover definição"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "Versão API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Converter para camada GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Teste de consistência de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "Nenhum problema encontrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Foi encontrado os seguintes problemas:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+"<html>O carregamento de dados de GPS não processados como mapa de dados é "
+"considerado prejudicial.<br> Se você deseja carregar traços, dê uma olhada "
+"aqui:</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10417,5 +10498,5 @@
 msgstr[1] "trilhas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10423,5 +10504,5 @@
 msgstr[1] "pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10430,5 +10511,5 @@
 msgstr[1] "uma trilha com {0} pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10437,5 +10518,5 @@
 msgstr[1] "{0} consiste em {1} trilhas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10444,24 +10525,28 @@
 msgstr[1] "{0} pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Correlacionar com GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Arcivo GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Arquivo {0} está carregado sob o nome \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Erro enquanto analisava {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Não foi possível ler \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10469,129 +10554,136 @@
 "on the photo and select a timezone<hr></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+"<html>Tire uma foto do seu GPS mostrando o tempo.<br>Exiba a foto aqui.<br> "
+"Em seguida, simplesmente pegue o tempo que você lê na foto e selecione um "
+"fuso horário<hr></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Hora da foto (info. do EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Hora do GPS (lido da foto acima) "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Estou no timezone de: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Sem data"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Abrir outra foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Sincronizar tempo de uma foto do aparelho GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
 "Please use the requested format"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+"Erro ao analisar a data.\n"
+"Por favor use o formato requisitado"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Data inválida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Nenhuma trilha GPX foi lida>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "Trilha GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Abrir outra trilha GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+"<html>Utilize foto de um horário preciso,<br>e.g. Tela do receptor de GPS</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Adivinhar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+msgstr "Coincida a primeira foto com o primeiro ponto gpx"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Ajuste manual"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "Sobrescreva a posição para: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+msgstr "Imagens georeferenciadas no dado exif ({0}/{1})"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Imagens que já estão etiquetadas ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Mostre miniaturas no mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Timezone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Deslocamento:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Relacione as imagens com trilhas GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Correlacione"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Timezone inválido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Offset inválido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Tentar novamente"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "Não foi possível encontrar imagens coincidente!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "Nenhum gpx selecionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10599,22 +10691,24 @@
 "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 msgstr[0] ""
+"<html>Corresponde a <b>{0}</b> da <b>{1}</b> foto para trilha GPX.</html>"
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+"<html>Corresponde as <b>{0}</b> das <b>{1}</b> fotos para trilha GPX.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Timezone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Segundos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10623,45 +10717,49 @@
 msgstr[1] "Diferença de {0} dias"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
 "adjust the sliders to manually match the photos."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+"Um erro ocorreu ao tentar combinar as fotos com a trilha GPX. Você pode "
+"ajustar os controles deslizantes para corresponder manualmente as fotos."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+msgstr "A combinação das fotos com a trilha falhou."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Ajustar timezone e deslocamento"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "As fotos selecionadas não contêm informação de tempo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "As fotos não contêm informação de tempo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+"A trilha GPX selecionada não contém registros de tempo. Por favor selecione "
+"outra trilha."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "Trilha GPX não tem informação de tempo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Você tem que selecionar uma trilha GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Não selecionar trilha GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10672,5 +10770,5 @@
 "Formato esperado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10678,57 +10776,56 @@
 "Expected format: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+"Erro ao analisar o deslocamento.\n"
+"Formato esperado: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrair coordenadas GPS do EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Iniciando varredura de diretório"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+msgstr "Um dos arquivos selecionados foi nulo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Ler fotos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+"Não foi possível conseguir o caminho \"canonical\" para o diretório {0}\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Varrendo diretório {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+msgstr "Arquivo nulo encontrado no diretório {0}\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+msgstr "Erro ao obter os arquivos do diretório {0}\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imagens Geotagueadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Correlacionar com GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10737,5 +10834,5 @@
 msgstr[1] "{0} imagens carregadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10744,10 +10841,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Remover arquivo de imagem do disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10755,6 +10852,8 @@
 "permanently lost!</h3></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+"<html><h3>Remover o arquivo {0} do disco?<p>O arquivo de imagem será perdido "
+"permanentemente!</h3></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "O arquivo de imagem não pode ser removido."
@@ -10819,9 +10918,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
-msgstr ""
+msgstr "Zoom melhor ajuste e 1:1"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
-msgstr ""
+msgstr "Mova a janela para o painel lateral"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
@@ -10849,4 +10948,6 @@
 "Direction {0}°"
 msgstr ""
+"\n"
+"Direção {0}°"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
@@ -10854,9 +10955,9 @@
 msgstr "Imagens JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "Marcador gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10864,5 +10965,5 @@
 msgstr[1] "marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10871,9 +10972,21 @@
 msgstr[1] "{0} consiste em {1} marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Não existem marcadores de som nessa camada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "Mostrar Texto/Ícones"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Alternar visibilidade do marcador de texto e ícones."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Sincronizar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10882,5 +10995,5 @@
 "sincronização"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10888,30 +11001,18 @@
 msgstr "Audio sincronizado no ponto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Não foi possível sincronizar na camada sendo reproduzida."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Alternar visibilidade do marcador de texto e ícones."
+msgstr "Você precisa pausar o som no ponto da trilha onde você deseja marcar."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -10920,4 +11021,6 @@
 "track you were playing (after the first marker)."
 msgstr ""
+"Você precisa arrastar o buscador de audio para perto da trilha GPX cuja "
+"trilha sonora associada estava tocando (depois do primeiro marcador)."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:225
@@ -10945,9 +11048,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:129
 msgid "Illegal dash pattern, values must be positive"
-msgstr ""
+msgstr "Padrão de traço ilegal, os valores devem ser positivos"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:135
 msgid "Illegal dash pattern, at least one value must be > 0"
-msgstr ""
+msgstr "Padrão de traço ilegal, pelo menos um valor deve ser > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:102
@@ -10985,4 +11088,7 @@
 "to use the Access Token in this JOSM session only.</html>"
 msgstr ""
+"<html>Selecione para salvar o Token de Acesso nas preferências do JOSM."
+"<br>Deselecione para usar o Token de Acesso apens nessa sessão do JOSM.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
@@ -11017,5 +11123,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
 msgid "Click to abort resetting to the OAuth default values"
-msgstr ""
+msgstr "Clique aqui para cancelar a redefinição dos valores padrão do OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
@@ -11024,4 +11130,6 @@
 "current custom settings are not saved.</html>"
 msgstr ""
+"<html>O JOSM está prestes a redefinir as configurações do OAuth para os "
+"valores padrão.<br>As configurações atuais não estão salvas.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
@@ -11130,4 +11238,6 @@
 msgid "Click to redirect you to the authorization form on the JOSM web site"
 msgstr ""
+"Clique para redirecionar você para o formulário de autorização no JOSM web "
+"site"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:361
@@ -11262,5 +11372,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
 msgid "Please enter an Access Token Secret"
-msgstr ""
+msgstr "Por favor insira um Token de Acesso Secreto"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
@@ -11269,9 +11379,11 @@
 "Secret"
 msgstr ""
+"O Token de Acesso Secreto não pode estar vazio. Por favor insira um Token de "
+"Acesso Secreto"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:438
 msgid "Click to test the Access Token"
-msgstr ""
+msgstr "Clique para testar o Token de Acesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:115
@@ -11291,13 +11403,13 @@
 #, java-format
 msgid "Get an Access Token for ''{0}''"
-msgstr ""
+msgstr "Obter um Token de Acesso para \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:344
 msgid "Close the dialog and cancel authorization"
-msgstr ""
+msgstr "Feche o diálogo e cancele a autorização"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:363
 msgid "Close the dialog and accept the Access Token"
-msgstr ""
+msgstr "Feche o diálogo e aceite o Token de Acesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
@@ -11305,5 +11417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
-msgstr ""
+msgstr "Aviso: falha ao cancelar a operação OAuth em execução"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
@@ -11320,5 +11432,5 @@
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
-msgstr ""
+msgstr "O OSM não retornou um cookie de sessão em resposta a \"{0}\","
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
@@ -11326,9 +11438,11 @@
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
+"Falha ao autenticar o usuário \"{0}\" com a senha \"***\" como usuário do "
+"OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
-msgstr ""
+msgstr "Falha ao autorizar o pedido OAuth \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
@@ -11339,15 +11453,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
 msgid "Initializing a session at the OSM website..."
-msgstr ""
+msgstr "Começando uma sessão no site do OSM..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
-msgstr ""
+msgstr "Auteticando a sessão para o usuário \"{0}\"..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
-msgstr ""
+msgstr "Autorizando o token de requisição \"{0}\"..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
@@ -11472,4 +11586,11 @@
 "</html>"
 msgstr ""
+"<html>O JOSM recuperou com sucesso um Token de Requisição. O JOSM está "
+"abrindo agora uma página de autorização em um navegador externo. Por favor, "
+"faça o login com o seu nome de usuário e senha do OSM e siga as instruções "
+"para autorizar o Token de Requisição. Em seguida, volte para essa janela e "
+"clique em <strong>{0}</strong><br><br>Se a abertura do navegador externo "
+"falhar você pode copiar o seguinte URL de autorização e colar dentro do "
+"campo de endereço do seu navegador.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
@@ -11658,21 +11779,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Explicit waypoints with valid timestamps."
-msgstr ""
+msgstr "Pontos de interesse explícitos com registros de tempo válidos."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Explicit waypoints with time estimated from track position."
 msgstr ""
+"Pontos de interesse explícitos com tempo estimado a partir da posição na "
+"trilha."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
 msgid "Named trackpoints."
-msgstr ""
+msgstr "Pontos de trilha nomeados."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
 msgid "Modified times (time stamps) of audio files."
-msgstr ""
+msgstr "Tempos modificados (registros de tempo) dos arquivos de audio."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
 msgid "Start of track (will always do this if no other markers available)."
 msgstr ""
+"Início da trilha (sempre faça isso se não houver outros marcadores "
+"disponíveis)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
@@ -11809,4 +11934,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Nenhum"
@@ -11821,5 +11947,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "Desenha um círculo com valor HDOP."
@@ -11922,5 +12048,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Somente sugestões de sentido interessantes (ex. tag de mão única)"
@@ -11928,5 +12054,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Somente no sentido da via."
@@ -11956,5 +12082,20 @@
 msgstr "Criar marcadores quando ler um arquivo GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Autor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Diesel"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Barco"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11964,9 +12105,9 @@
 "abrir um camada GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Desenhar linhas entre os pontos GPS brutos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11976,9 +12117,9 @@
 "\"-1\" para desenhar todas as linhas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Tamanho máximo para arquivos locais (em metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11987,10 +12128,10 @@
 "todas as linhas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Tamanho máximo (em metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11999,10 +12140,10 @@
 "informações de linha."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Desenha setas de direção para linhas, conectando pontos GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12011,5 +12152,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12018,13 +12159,13 @@
 "Não desenha a seta se ela não estiver a pelo menos esta distância da última."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Distância mínima (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Desenha pontos grandes para os pontos GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12034,56 +12175,66 @@
 "personalizado no Gerenciador de Camadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+msgstr "Pontos coloridos e segmentos de trilha por velocidade."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
 "capture device needs to log that information."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+"Pontos coloridos e segmentos de trilha por diluição da posição (HDOP). Seu "
+"equipamento de captura precisa registrar essas informações."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+msgstr "Permita ajustar a cor da trilha para diferentes médias de velocidade."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Coloração de trilhas e pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "Pontos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
-msgstr ""
+msgstr "Desenhar sugestões de direção para os segmentos de trilha."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Desenhar as camadas de dados inativas em uma cor diferente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Dados OSM"
@@ -12317,4 +12468,6 @@
 "encountered.</p>"
 msgstr ""
+"<p>O falso modificador \"disabled\" desabilitará o atalho quando encontrado."
+"</p>"
 
 #. scroll up
@@ -12441,21 +12594,26 @@
 msgstr "Você precicar reiniciar JOSM para aplicar mudanças."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Método de Projeção"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Código de Projeção"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Mostra coordinados como"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Método de Projeção"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Código de Projeção"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Medições"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Projeção do Mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12480,9 +12638,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
 msgid "Configure whether to use a proxy server"
-msgstr ""
+msgstr "Configure se usar um servidor de proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
 msgid "Configure whether to create backup files"
-msgstr ""
+msgstr "Configure se criar arquivos de segurança"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -12554,5 +12712,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
 msgid "Add a filename or an URL of an active style"
-msgstr ""
+msgstr "Adicione um nome de arquivo ou um URL de um estilo ativo"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:465
@@ -12562,5 +12720,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:486
 msgid "Edit the filename or URL for the selected active style"
-msgstr ""
+msgstr "Edite o nome de arquivo ou URL para o estilo ativo selecionado"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:508
@@ -12597,4 +12755,6 @@
 "<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
+"Falha ao carregar a lista de fontes de estilos de<br>\"{0}\"."
+"<br><br>Detalhes (não traduzido):<br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
@@ -12602,5 +12762,5 @@
 #, java-format
 msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
-msgstr ""
+msgstr "Aviso: formato de entrada na lista estilos ilegal \"{0}\". Tem \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
@@ -12610,4 +12770,6 @@
 "Do you want to keep it?"
 msgstr ""
+"Não foi possível ler a tag fonte pré-definida: {0}\n"
+"Você deseja manter isso?"
 
 #. Should not happen, but at least show message
@@ -12615,5 +12777,5 @@
 #, java-format
 msgid "Could not read tagging preset source {0}"
-msgstr ""
+msgstr "Não foi possível ler a tag fonte pré-definida: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
@@ -12624,4 +12786,7 @@
 "table></html>"
 msgstr ""
+"<html>Tag fonte pré-definida {0} pode ser carregada, mas a tag contém erros. "
+"Você tem certeza que deseja usá-la?<br><br><table width=600> O erro é: [{1}:"
+"{2}]{3}</table></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
@@ -13025,5 +13190,5 @@
 msgstr "Adicionar nova tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -13032,49 +13197,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Mais informações sobre esta característica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr "elementos"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Atributos opcionais:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconhecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13084,15 +13249,15 @@
 msgstr "Não foi possível ler a fonte de preferência de tags: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analisando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementos do tipo {0} são suportados."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13102,17 +13267,17 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Nada selecionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Seleção inadequada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Aplicar Preferência"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13130,7 +13295,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Pesquisar: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -13139,17 +13303,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Procure por objetos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Mostra o nome traduzido nas listas de seleção"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Pesquisar: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13454,5 +13615,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Erro de interpretação: estrutura inválida para documento gpx"
@@ -14919,5 +15080,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15158,5 +15319,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
 msgid "GPX upload was successful"
-msgstr ""
+msgstr "O envio do arquivo GPX foi concluído com sucesso"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:305
@@ -15167,5 +15328,5 @@
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
-msgstr ""
+msgstr "Enviando trilha GPX: {0}% ({1} de {2})"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:379
@@ -15199,5 +15360,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Interpolação de Endereços"
@@ -15539,41 +15700,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "Endereço do prédio"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "Número da casa:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Nome da Rua:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Incremento"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Decremento"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Números:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15590,25 +15751,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Informe o tamanho do prédio"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15646,18 +15807,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Construções"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Rua"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15883,8 +16044,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "água"
@@ -15945,6 +16106,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "endereço"
@@ -16418,34 +16579,34 @@
 "Primeiro selecione uma delas, então repita"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Camada vazia"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Camada WMS ({0}), {1} imagem(ns) carregadas"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16454,14 +16615,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -16538,22 +16699,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Baixar objeto..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Baixar dados do mapa no fim da via selecionada"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Baixar agora"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Por favor selecione no mínimo uma tarefa para baixar"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16563,12 +16720,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Teste {0}/{1}: Iniciando {2}"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Carregando {0}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16599,9 +16756,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -16611,5 +16768,5 @@
 msgstr "EditGpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -16618,11 +16775,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr ""
@@ -16632,5 +16789,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr ""
@@ -16640,13 +16797,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16885,5 +17042,5 @@
 msgstr ""
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Imagens importadas"
@@ -17232,8 +17389,6 @@
 msgstr ""
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Reiniciar"
@@ -17264,5 +17419,5 @@
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr ""
@@ -17354,5 +17509,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -17416,13 +17571,13 @@
 msgstr "Fila"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "offline"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "online"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17534,94 +17689,94 @@
 msgstr ""
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "configurações"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "mudar a hora de modificação do arquivo:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "para tempo gps"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "para valor antigo (mtime não modificado)"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "Escrevendo informação de posicionamento no arquivo de imagem..."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "Não dá pra ler mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "Não dá pra escrever mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "Tente falhou não dá pra ler mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "Teste falhou: não dá pra escrever mtime."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr ""
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -17662,9 +17817,9 @@
 msgstr "Nova camada de imagem a partir do arquivo..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "A imagem não foi criada de forma apropriada."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17842,8 +17997,13 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "Versão mesclada"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "confirmar todas as ações do Controle Remoto manualmente"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
@@ -17851,13 +18011,13 @@
 "programas."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Controle Remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Configurações do plugin de Controle Remoto."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17869,50 +18029,58 @@
 "aplicação externa."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Ações permitidas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detalhes do pedido: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Você quer permitir isto?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17920,5 +18088,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Reverter"
@@ -18117,41 +18285,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "imagem "
@@ -18453,4 +18621,14 @@
 msgid "Terrace"
 msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Separador"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19170,6 +19348,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19179,9 +19357,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -19260,6 +19438,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19267,5 +19445,5 @@
 msgstr "Erros de validação"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Sem erros de validação"
@@ -19504,32 +19682,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Unir nós duplicados?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Nós duplicados"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Nós duplicados"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Unir nós duplicados?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Nós duplicados"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Unir nós duplicados?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19568,5 +19740,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -20085,5 +20257,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr ""
@@ -20220,10 +20392,10 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -20369,10 +20541,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20558,28 +20730,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Download automático"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20590,65 +20758,69 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Sim, buscar imagens"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "URL inválido?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Baixar imagens visíveis"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Mudar resolução"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Recarregar imagens erradas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Salvar camada WMS para arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Salvar camada WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Carregar camada WMS de um arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Carregar camada WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Erro no formato do arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Erro ao carregar arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Adicionar marcador para esta camada WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Download automático"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20727,5 +20899,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20760,5 +20932,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20779,5 +20951,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "floresta"
@@ -20796,71 +20968,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "limite"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Incremento"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "linha de transmissão"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Multipolígono"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Rede"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "transporte public"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Restrição"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "rota"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Colar"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "hidrovia"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -21139,7 +21301,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Descarregar do OSM ao largo desta via"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -21344,6 +21505,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21352,5 +21518,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21359,5 +21525,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21368,10 +21534,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21380,5 +21546,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21388,5 +21554,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21395,15 +21561,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21412,5 +21578,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21545,5 +21711,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Referência"
@@ -22082,5 +22248,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -22093,5 +22259,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "madeira"
@@ -22395,9 +22561,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "sim"
@@ -22507,9 +22673,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "não"
@@ -22768,5 +22934,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr ""
@@ -22815,5 +22981,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "serviço"
@@ -22848,5 +23014,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "construção"
@@ -22933,5 +23099,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "caminhada"
@@ -22966,5 +23132,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -23134,14 +23300,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operador"
@@ -23409,6 +23575,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Altitude"
@@ -23856,5 +24022,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
@@ -24260,5 +24426,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Voltagem"
@@ -24622,31 +24788,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Horário de Funcionamento"
@@ -24706,90 +24872,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Seg-Sex 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ter-Dom 08:00-15:00; Sáb 08:00-12:00"
@@ -24902,7 +25068,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Número de Referência"
@@ -24918,5 +25084,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr ""
@@ -24929,6 +25095,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Taxa"
@@ -25104,5 +25270,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Cadeira de Rodas"
@@ -25139,6 +25305,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Abrigo"
@@ -25146,5 +25312,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Banco"
@@ -25263,5 +25429,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr ""
@@ -25422,5 +25588,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Cozinha"
@@ -25428,73 +25594,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "chinessa"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hambúrguer"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "grega"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "alemã"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asiática"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "tailandesa"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexicana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japonesa"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Lanchonete"
@@ -25502,17 +25673,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar Lanchonete Fast-Food"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Café"
@@ -25520,9 +25691,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Editar Café"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Bar/Pub"
@@ -25530,18 +25701,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Editar Bar/Pub"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar"
@@ -25549,9 +25721,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Boate"
@@ -25559,24 +25731,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Editar Boate"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Atração"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Editar Atração Turística"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museu"
@@ -25584,9 +25756,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Editar Museu"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoológico"
@@ -25595,9 +25767,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Editar Zoológico"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Mirante"
@@ -25605,24 +25777,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Editar Mirante"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Parque Temático"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Editar Parque Temático"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Arte"
@@ -25630,5 +25802,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Editar Arte"
@@ -25636,19 +25808,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Centro de Informações Turísticas"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -25686,5 +25858,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25692,28 +25864,28 @@
 msgstr "estrada"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "cidade"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "região"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -25723,5 +25895,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -25729,5 +25901,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr ""
@@ -25735,6 +25907,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -25742,5 +25914,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Mountain bike"
@@ -25748,6 +25920,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Esqui"
@@ -25755,5 +25927,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -25761,46 +25933,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "... outros modos de transporte possíveis"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Quadro de Informações"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "natureza"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "vida selvagem"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "polo"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25808,29 +25988,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Outros Pontos de Informação"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Editar Abrigo"
@@ -25838,25 +26018,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Lareira"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Campo de Picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Editar Campo de Picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Lugares Históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Castelo"
@@ -25865,19 +26045,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Editar Castelo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruínas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Editar Ruínas"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Sítio Arqueológico"
@@ -25886,9 +26066,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Editar Sítio Arqueológico"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Campo de Batalha"
@@ -25896,10 +26076,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Editar Campo de Batalha"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25907,5 +26087,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25913,15 +26093,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Editar Monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Memorial"
@@ -25929,55 +26109,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Editar Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Editar Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Lazer"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Parque Aquático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Editar Parque Aquático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Parquinho"
@@ -25985,35 +26165,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Editar Parquinho"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Pescaria"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Editar Pescaria"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Esportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Estádio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Editar Estádio"
@@ -26027,6 +26207,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "selecionar esporte:"
@@ -26442,31 +26622,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "esporte"
@@ -26476,240 +26656,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "arco e flecha"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "futebol australiano"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "basquete"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "boliche"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "canoagem"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "críquete"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "corrida de cachorros"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golfe"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "ginástica olímpica"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hóquei"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "corrida de cavalos"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "automobilismo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "esqui"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "futebol"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "natação"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "ping-pong"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tênis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Centro de Esportes"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Editar Centro de Esportes"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Mini-Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Editar Mini-Golf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr ""
@@ -26751,23 +26931,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "tipo"
@@ -26809,211 +26989,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "estádio"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr ""
@@ -27021,52 +27201,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Dificuldade"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr ""
@@ -27074,204 +27254,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Futebol Australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Editar Futebol Australiano"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Editar Campo de Baseball"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basquetebol"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Editar Basquetebol"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Editar Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Críquete"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Editar Críquete"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Editar Hockey"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Tênis de mesa"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Editar Tênis de Mesa"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Editar Tênis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Construção humana"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Edificação"
@@ -27279,5 +27459,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Prédio Público"
@@ -27285,10 +27465,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Editar Prédio Público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Prefeitura"
@@ -27296,10 +27476,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Editar Prefeitura"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Embaixada"
@@ -27307,10 +27487,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Fórum"
@@ -27319,10 +27499,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Editar Fórum"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Presídio"
@@ -27331,10 +27511,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Editar Presídio"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Polícia"
@@ -27344,10 +27524,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Editar Polícia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Bombeiros"
@@ -27356,10 +27536,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Editar Bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Correios"
@@ -27367,5 +27547,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Editar Correios"
@@ -27373,15 +27553,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Creche"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Editar Creche"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Escola"
@@ -27389,10 +27569,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Editar Escola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Universidade"
@@ -27400,10 +27580,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Editar Universidade"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Faculdade"
@@ -27411,5 +27591,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Editar Faculdade"
@@ -27417,5 +27597,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Cinema"
@@ -27424,10 +27604,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Editar Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Biblioteca"
@@ -27436,9 +27616,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Editar Biblioteca"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Centro de Artes"
@@ -27446,10 +27626,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Editar Centro de Artes"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Teatro"
@@ -27458,10 +27638,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Editar Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Lugar de Adoração"
@@ -27471,5 +27651,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Editar Lugar de Adoração"
@@ -27478,6 +27658,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religião"
@@ -27486,66 +27666,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "budismo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "cristianismo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hinduísmo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jainismo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "judaísmo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "muçulmano"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikhismo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "espiritismo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoísmo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "unitarianismo"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastrianismo"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Denominação"
@@ -27554,81 +27734,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglicana"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "batista"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "católica"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evangélica"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "testemunha de jeová"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "luterana"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mórmon"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbiteriana"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "xiismo"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunismo"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Endereços"
@@ -27637,5 +27817,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Editar Informações de Endereço"
@@ -27643,5 +27823,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Número da casa"
@@ -27649,25 +27829,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Nome da casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Nome do rua"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Cidade"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "CEP"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Código do país"
@@ -27676,5 +27856,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Editar Interpolação de Endereços"
@@ -27682,61 +27862,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Esquema de numeração"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "números ímpares"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "números pares"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Construção humana"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Editar Fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Editar Torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "comunicação"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "observação"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Altura (metros)"
@@ -27744,25 +27924,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Torre de Água"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Editar Torre de Água"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gasômetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Editar Gasômetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Farol"
@@ -27770,10 +27950,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Editar Farol"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Moinho de Vento"
@@ -27781,10 +27961,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Editar Moinho de Vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Cano"
@@ -27793,41 +27973,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Editar Cano"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "gás"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "calor"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "petróleo"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "qualquer substância"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Localidade"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "subaquático"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Estação de Tratamento de Esgoto"
@@ -27837,10 +28017,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Editar Estação de Tratamento de Esgoto"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Guindaste"
@@ -27848,5 +28028,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Editar Guindaste"
@@ -27854,10 +28034,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Vértice Geodésico"
@@ -27865,10 +28045,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Editar Vértice Geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Câmera de Vigilância"
@@ -27876,23 +28056,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Editar Câmera de Vigilância"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "público"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Gerador de Energia"
@@ -27902,35 +28082,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Editar Gerador de Energia"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "eólica"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "hidrelétrica"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fóssil"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "carvão"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "carvão"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Estação de Energia"
@@ -27939,10 +28119,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Editar Estação de Energia"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Subestação de Energia"
@@ -27951,5 +28131,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Editar Subestação de Energia"
@@ -27957,10 +28137,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Torre de Energia"
@@ -27971,23 +28151,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Editar Torre de Energia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "polo"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Linha de transmissão"
@@ -27996,78 +28176,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Editar Linha de Transmissão"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Tipo de Linha de Transmissão"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "linha de transmissão"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "online"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Quantidade de Cabos"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de cabos (ou condutores) por cabo-de-força"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "simples"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "duplo"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "triplo"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "quádruplo"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Comodidades"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Banheiros"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Caixa de Correio"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefone"
@@ -28076,5 +28254,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Editar Telefone"
@@ -28082,5 +28260,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Moedas"
@@ -28088,5 +28266,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Notas"
@@ -28094,5 +28272,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Carteiras Eletrónicas ou Cartões pré-pagos"
@@ -28100,5 +28278,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Cartões de Débito"
@@ -28106,15 +28284,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Cartão de Crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Cartão Telefônico"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Reciclagem"
@@ -28123,5 +28301,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Editar Centro de Reciclagem"
@@ -28129,35 +28307,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Baterias"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Latas"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Roupas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Ferro Velho"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Cesta de Lixo"
@@ -28165,5 +28343,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Editar Cesta de Lixo"
@@ -28172,31 +28350,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "rocha"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Cor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "preto"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "marrom"
@@ -28275,39 +28453,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "verde"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "vermelho"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "cinza"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "branco"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Número de Assentos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -28316,30 +28494,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "metade"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "cheio"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Ocutar"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Bloquear"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Chafariz"
@@ -28348,10 +28526,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Editar Chafariz"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Bebedouro"
@@ -28360,10 +28538,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Editar Bebedouro"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Hidrante"
@@ -28372,5 +28550,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Editar Hidrante"
@@ -28378,5 +28556,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Berçário"
@@ -28384,15 +28562,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Editar Berçário"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Lojas"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Concessionária"
@@ -28400,10 +28578,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Editar Loja de Carros"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Casa de Bicicleta"
@@ -28412,28 +28590,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Editar Loja de Bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Editar Supermercado"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Loja de Conveniência"
@@ -28441,9 +28619,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Editar Loja de Conveniência"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Quiosque"
@@ -28451,27 +28629,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Editar Quiosque"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Livraria"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Editar Livraria"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Agência de Viagem"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Editar Agência de Viagem"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Açougue"
@@ -28479,9 +28657,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Editar Açougue"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Padaria"
@@ -28489,9 +28667,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Editar Padaria"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Floricultura"
@@ -28499,18 +28677,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Editar Floricultura"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Orgânicos"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Editar Loja de Orgânicos"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Álcool"
@@ -28518,54 +28696,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Editar"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Editar Loja de Bebidas"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Computador"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Editar Loja de Computador"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Eletrônicos"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Editar Loja de Eletrônicos"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Equipamentos de Áudio"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Editar Loja de Equipamentos de Áudio"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Móveis"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Editar Loja de Móveis"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Loja de Plantas"
@@ -28573,9 +28751,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Editar Loja de Plantas"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Componente físico"
@@ -28583,9 +28761,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Editar Loja de Utilidades Domésticas"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Loja de Ferragens"
@@ -28593,54 +28771,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar Loja de Ferragens"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Papelaria"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Editar Papelaria"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Cabelereiro"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Editar Cabelereiro"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Sapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Editar Loja de Sapatos"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Brinquedos"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Editar Loja de Brinquedos"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Locadora de Vídeo"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Editar Locadora de Vídeo"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Lavanderia à Seco"
@@ -28648,9 +28826,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Editar Lavanderia à Seco"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -28658,9 +28836,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Editar Lavanderia"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -28668,24 +28846,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Editar Loja de Esportes"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Óculos"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Editar Loja de Óculos"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr ""
@@ -28693,5 +28871,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Editar Máquina de Vendas"
@@ -28699,97 +28877,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Produtos à venda"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "tíquetes de transporte público"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "mapas de transporte público"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "tíquetes de estacionamento"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "comida"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "bebidas"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "doces"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "cigarros"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "ração animal"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "jornais"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "brinquedos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "selos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "Cartões SIM"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "vales"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "preservativos"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "absorventes"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "sacos para fezes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Cartões de fidelidade"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Dinheiro"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Banco"
@@ -28797,14 +28975,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Editar Banco"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Caixa Eletrônico"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Loja de Câmbio"
@@ -28812,5 +28990,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Editar Loja de Câmbio"
@@ -28818,15 +28996,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Editar Caixa Eletrônico"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Saúde"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Médicos"
@@ -28834,18 +29012,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Editar Médicos"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Dentistas"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Editar Dentistas"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Farmácia"
@@ -28853,5 +29031,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Editar Farmácia"
@@ -28859,9 +29037,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Hospital"
@@ -28869,10 +29047,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Editar Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Entrada de Emergência"
@@ -28881,5 +29059,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Editar Entrada de Emergência"
@@ -28888,20 +29066,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Número do Ponto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Número de telefone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use código internacional, como +12-345-67890)"
@@ -28909,5 +29087,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Veterinária"
@@ -28916,64 +29094,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Editar Veterinária"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Editar Continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Editar País"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Estado"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Editar Estado"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Região"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Editar Região"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Condado"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Editar Condado"
@@ -28981,15 +29159,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Cidade"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Editar Cidade (mais que 100 mil habitantes)"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Cidade (menos que 100 mil habitantes)"
@@ -28997,10 +29175,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Editar Cidade (menos que 100 mil habitantes)"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Bairro"
@@ -29008,25 +29186,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Editar Bairro"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Vilarejo"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Editar Vilarejo"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr ""
@@ -29034,5 +29212,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Localidade"
@@ -29040,10 +29218,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Editar Localidade"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Ilha"
@@ -29051,10 +29229,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Editar Ilha"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Ilhota"
@@ -29062,5 +29240,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Editar Ilhota"
@@ -29068,5 +29246,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Entrada de Caverna"
@@ -29074,10 +29252,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Editar Entrada de Caverna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Pico"
@@ -29085,10 +29263,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Editar Pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Geleira"
@@ -29096,10 +29274,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Editar Geleira"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Vulcão"
@@ -29107,70 +29285,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Editar Vulcão"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Fronteiras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Editar Fronteiras Nacionais"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Editar Fronteiras Administrativas"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Editar Fronteiras Civis"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Político"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Editar Fronteiras Políticas"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Parque nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Editar Fronteira de Parque Nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Uso da terra"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Árvore"
@@ -29179,15 +29357,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Editar Árvore"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Nome Botânico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Floresta"
@@ -29196,5 +29374,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Editar Floresta"
@@ -29202,17 +29380,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "decídua"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "misturado"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Floresta"
@@ -29221,14 +29399,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Editar zona Florestal"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Reserva Natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Editar Reserva Natural"
@@ -29236,25 +29414,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Arbusto"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Editar arbusto"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr ""
@@ -29262,10 +29440,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Editar rocha"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Matagal"
@@ -29273,5 +29451,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Editar matagal"
@@ -29279,5 +29457,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Fazenda"
@@ -29286,45 +29464,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Terra agrícola"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Editar zona Agrícola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Vinhedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Editar zona de Vinhedos"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Hortas comunitárias"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -29332,25 +29510,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Jardim"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Editar Jardim"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Grama"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Editar zona de Gramado"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -29358,10 +29536,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Comum"
@@ -29369,20 +29547,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Editar Parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "área de recreação"
@@ -29390,5 +29568,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29396,15 +29574,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Editar zona Residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Cemitério"
@@ -29412,9 +29590,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Editar Cemitério"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Cemitério"
@@ -29422,39 +29600,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Editar zona de Cemitério"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Comércio"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Editar zona Comercial"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Editar zona Comercial"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Editar zona Industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr ""
@@ -29462,15 +29640,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Editar zona Militar"
@@ -29478,50 +29656,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Área de construção"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Editar zona para Construção"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Aterro"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Editar Aterro"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Pedreira"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -29531,5 +29709,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -29541,5 +29719,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "segmento externo"
@@ -29547,5 +29725,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "segmento interno"
@@ -29553,5 +29731,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -29562,5 +29740,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -29568,36 +29746,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29605,5 +29783,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Restrição de manobra"
@@ -29612,5 +29790,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Editar restrição de manobras"
@@ -29618,34 +29796,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Restrição"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "proibida_conversão_esquerda"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "proibida_conversão_direita"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "proibido_em_frente"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "proibido_retornar"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "somente_a_direita"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "somente_a_esquerda"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "somente_em_frente"
@@ -29654,15 +29832,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "do caminho"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "nó de via ou caminho"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "para caminho"
@@ -29670,5 +29848,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Rota"
@@ -29677,5 +29855,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Editar Rota"
@@ -29683,5 +29861,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Tipo de rota"
@@ -29789,5 +29967,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29798,17 +29976,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "ônibus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "estrada"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "barca"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "Esqui"
@@ -29876,5 +30054,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29884,9 +30062,9 @@
 msgstr "a pé"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "bonde/VLT"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "desvio"
@@ -29900,10 +30078,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "Metrô"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Descrição de símbolo"
@@ -29911,31 +30089,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Rede"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "alternativa"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "temporário"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "conexão"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Cor (hex)"
@@ -29944,30 +30122,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "segmento de rota"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "segmento em frente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "Ponto de parada"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "ponto de parada em frente"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "ponto de parada atrás"
@@ -30194,5 +30372,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "depreciado"
@@ -30845,4 +31023,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30946,11 +31132,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr ""
@@ -31463,5 +31649,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "embarcadouro"
@@ -31475,5 +31661,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "canalização"
@@ -31617,13 +31803,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "lazer"
@@ -31637,5 +31823,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "marina"
@@ -31731,10 +31917,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr ""
@@ -31836,10 +32022,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -32277,24 +32463,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -32326,6 +32512,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -32386,8 +32572,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "saúde"
@@ -32740,26 +32926,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "loja"
@@ -32831,8 +33017,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -32933,9 +33119,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turismo"
@@ -33023,9 +33209,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "histórico"
@@ -33038,5 +33224,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr ""
@@ -33050,5 +33236,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "aterro"
@@ -33070,5 +33256,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr ""
@@ -33082,5 +33268,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "fazenda"
@@ -33103,5 +33289,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "venda"
@@ -33115,5 +33301,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "industrial"
@@ -33127,5 +33313,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "Área contaminada"
@@ -33139,5 +33325,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "campo"
@@ -33151,5 +33337,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr ""
@@ -33206,7 +33392,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "exército"
@@ -33220,5 +33406,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "Cemitério"
@@ -33231,5 +33417,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "cume"
@@ -33244,5 +33430,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "geleira"
@@ -33256,5 +33442,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "vulcão"
@@ -33309,8 +33495,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr ""
@@ -33324,5 +33510,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "arbusto"
@@ -33336,5 +33522,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr ""
@@ -33348,5 +33534,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -33360,5 +33546,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "lama"
@@ -33372,5 +33558,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "praia"
@@ -33448,8 +33634,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "rota"
@@ -33538,12 +33724,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "limite"
@@ -33693,11 +33879,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "lugar"
@@ -33711,5 +33897,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -34065,6 +34251,19 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid "closedway"
-#~ msgstr "via sem saída"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "O caminho selecionado não contém o nó selecionado."
+#~ msgstr[1] "O caminho selecionado não contém todos nós selecionados."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Graus Minutos Segundos"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Digite um comentário de envio (mín. de 3 caracteres)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Por gentile digite um comentário para este conjunto de mudanças (mínomo 3 "
+#~ "caracteres)"
 
 #~ msgid "Preparing..."
@@ -34082,7 +34281,4 @@
 #~ msgid "Unsaved Changes"
 #~ msgstr "Alterações Não Salvas"
-
-#~ msgid "Do not show again"
-#~ msgstr "Não mostrar novamente"
 
 #~ msgid "Rotate"
@@ -34282,4 +34478,7 @@
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Usar preferencia ''{0}''"
+
+#~ msgid "closedway"
+#~ msgstr "via sem saída"
 
 #~ msgid "Edit Properties"
@@ -34718,7 +34917,4 @@
 #~ msgstr "futebol americano"
 
-#~ msgid "Boat"
-#~ msgstr "Barco"
-
 #~ msgid "Motorboat"
 #~ msgstr "Barco motorizado"
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 22568)
+++ applications/editors/josm/i18n/po/ro.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-11 20:17+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 11:36+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-07-28 09:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -27,5 +27,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -56,14 +56,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -80,9 +79,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -125,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -163,5 +162,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -229,5 +228,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -243,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -261,11 +260,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -273,20 +273,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -321,5 +321,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Fuzionează"
@@ -387,5 +387,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -399,5 +399,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -419,4 +419,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -433,6 +434,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -444,5 +445,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -577,22 +578,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Combină calea"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Combină mai multe căi într-una."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Schimbă direcţiile?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Inversează şi Combină"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -602,5 +603,5 @@
 "din ele?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -608,10 +609,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combină {0} căi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Selectează te rog cel puţin două căi pentru a le combina."
@@ -658,10 +659,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -801,5 +802,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -865,10 +866,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Exportă ca GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Exportă datele într-un fişier GPX."
@@ -1058,5 +1059,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr ""
@@ -1469,20 +1470,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1506,5 +1507,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1515,6 +1516,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Eroare"
@@ -1541,5 +1542,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1547,5 +1548,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Salvează datele curente."
@@ -1602,10 +1603,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Salvează ca..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Salvează datele curente într-un fişier nou."
@@ -1648,5 +1649,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1673,5 +1674,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr ""
@@ -1740,18 +1741,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1759,5 +1765,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1769,20 +1775,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1790,5 +1786,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1796,5 +1792,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1802,5 +1798,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1944,5 +1940,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2902,22 +2898,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3058,25 +3054,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#, java-format
+msgid "Delete node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#, java-format
+msgid "Delete way {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
-msgid "Delete node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
-#, java-format
-msgid "Delete way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
-#, java-format
 msgid "Delete relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3085,5 +3081,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3092,5 +3088,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3100,5 +3096,5 @@
 msgstr[2] "Șterge {0} căi"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3107,5 +3103,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3255,5 +3251,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3506,8 +3502,15 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
 msgstr ""
 
@@ -3515,33 +3518,29 @@
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr ""
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr ""
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr ""
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3549,5 +3548,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3718,5 +3717,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "fundal"
@@ -3860,5 +3859,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr ""
@@ -3886,5 +3885,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr ""
@@ -3906,6 +3905,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -3974,5 +3973,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr ""
@@ -4059,5 +4058,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4152,69 +4151,69 @@
 msgstr "Parolă"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "utilizare"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opţiuni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Arată acest ajutor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Argument geometrie unix standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Descarcă perimetrul selectat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Descarcă locaţia de la adresă (cu lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Descarcă perimetrul selectat ca date gps neprelucrate"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Selectează cu căutarea dată"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Restabileşte preferinţele implicite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4224,9 +4223,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "exemple"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4234,46 +4233,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Se creează interfața grafică"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Rezolvă"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4282,5 +4280,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4376,33 +4374,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "scală"
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+msgid "The geographic longitude at the mouse pointer."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
-msgid "The geographic longitude at the mouse pointer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The name of the object at the mouse pointer."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+msgid "The geographic latitude at the mouse pointer."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
-msgid "The geographic latitude at the mouse pointer."
+msgid "The angle between the previous and the current way segment."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
-msgid "The angle between the previous and the current way segment."
+msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4410,9 +4408,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4427,4 +4425,17 @@
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+msgid "Metric"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "Alegeţi"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+msgid "Imperial"
 msgstr ""
 
@@ -5133,5 +5144,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr ""
@@ -5214,6 +5225,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5224,5 +5235,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5351,5 +5362,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr ""
@@ -5410,5 +5421,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5571,5 +5582,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5577,5 +5588,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5583,5 +5594,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5589,5 +5600,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5595,5 +5606,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5602,5 +5613,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5608,5 +5619,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5614,5 +5625,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5620,24 +5631,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5717,51 +5728,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Straturi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Deschide o listă cu toate straturile încărcate."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Comută starea vizibilă a stratului selectat."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Arată/Ascunde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Comută starea vizibilă a stratului selectat."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Mută stratul selectat un rând în sus."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Mută stratul selectat un rând în jos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr ""
@@ -5771,5 +5782,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr ""
@@ -6922,6 +6933,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6969,107 +6981,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Nume"
@@ -7407,5 +7419,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7492,5 +7504,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<diferit>"
@@ -8218,5 +8230,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8289,8 +8301,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr ""
@@ -8319,6 +8331,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "necunoscut"
@@ -8639,5 +8651,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr ""
@@ -8696,14 +8708,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+msgid "Enter an upload comment"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9134,5 +9146,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9154,5 +9166,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9160,60 +9172,91 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Revizie"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Continuă"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+msgid "Do not show this message again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9535,115 +9578,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "punct gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Personalizează trasarea liniilor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Utilizează opţiunile globale."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Trasează linii între puncte pentru acest strat."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Nu trasa linii între puncte pentru acest strat."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Selectaţi opţiunile pentru trasarea liniilor"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Personalizează culoarea"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Implicit"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Alegeţi o culoare"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importă imagini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
 #, java-format
 msgid "{0} track"
@@ -9653,23 +9604,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9678,5 +9629,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9685,10 +9636,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Converteşte la strat de date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9696,21 +9647,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9718,10 +9669,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9729,10 +9680,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9740,21 +9691,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9764,9 +9715,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9774,5 +9725,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9780,23 +9731,115 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Personalizează trasarea liniilor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Utilizează opţiunile globale."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Trasează linii între puncte pentru acest strat."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Nu trasa linii între puncte pentru acest strat."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Selectaţi opţiunile pentru trasarea liniilor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Personalizează culoarea"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Implicit"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Alegeţi o culoare"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importă imagini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9805,11 +9848,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9818,36 +9861,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} constă în:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9855,5 +9898,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9862,5 +9905,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -9869,5 +9912,5 @@
 msgstr[2] "de puncte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -9877,5 +9920,5 @@
 msgstr[2] "o urmă cu {0} de puncte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -9885,5 +9928,5 @@
 msgstr[2] "{0} este format din {1} de urme"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -9893,24 +9936,28 @@
 msgstr[2] "{0} de puncte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Eroare la prelucrarea {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nu am putut citi \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9919,34 +9966,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -9954,93 +10001,93 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10050,20 +10097,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10072,5 +10119,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10078,21 +10125,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10100,17 +10147,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10119,5 +10166,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10126,56 +10173,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Citesc {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imagini geoetichetate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10184,5 +10227,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10191,10 +10234,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10203,5 +10246,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10297,9 +10340,9 @@
 msgstr "Imagine JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10307,5 +10350,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10314,14 +10357,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10329,29 +10384,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
@@ -11194,4 +11237,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr ""
@@ -11206,5 +11250,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11307,5 +11351,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11313,5 +11357,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr ""
@@ -11341,5 +11385,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Despre"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Both"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11347,9 +11404,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11357,19 +11414,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11378,15 +11435,15 @@
 "despre linii."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11394,13 +11451,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Desenează puncte mai pari pentru punctele GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11408,9 +11465,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11418,46 +11475,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Date OSM"
@@ -11813,21 +11878,25 @@
 msgstr "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
-msgid "Display coordinates as"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
 msgid "Projection method"
 msgstr "Metodă de proiecţie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
+msgid "Display coordinates as"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+msgid "System of measurement"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12370,5 +12439,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12377,49 +12446,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12429,15 +12498,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Eroare la prelucrarea {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12448,17 +12517,17 @@
 msgstr[2] "Schimb {0} de obiecte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12476,7 +12545,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Căutare"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12485,7 +12553,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Caută obiecte"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
@@ -12494,7 +12561,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Caută obiecte"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12789,5 +12855,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -14223,5 +14289,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14483,5 +14549,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr ""
@@ -14823,41 +14889,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -14874,25 +14940,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -14930,18 +14996,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15165,8 +15231,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr ""
@@ -15227,6 +15293,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr ""
@@ -15692,34 +15758,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15728,14 +15794,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -15812,22 +15878,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Descarc datele OSM..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Descarcă hărţi de la serverul OSM."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Descărcaţi obiect"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Selectează te rog cel puţin două căi pentru a le combina."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -15842,7 +15904,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Citesc {0}..."
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -15873,9 +15935,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15885,5 +15947,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -15892,11 +15954,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr ""
@@ -15906,5 +15968,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr ""
@@ -15914,13 +15976,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16159,5 +16221,5 @@
 msgstr ""
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr ""
@@ -16506,8 +16568,6 @@
 msgstr ""
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr ""
@@ -16538,5 +16598,5 @@
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr ""
@@ -16628,5 +16688,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -16690,13 +16750,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -16808,93 +16868,93 @@
 msgstr ""
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -16936,9 +16996,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17116,20 +17176,24 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "read protocol version"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17138,50 +17202,58 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17189,5 +17261,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Anulează"
@@ -17386,41 +17458,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -17719,4 +17791,13 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:288
 msgid "Terrace"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+msgid "Seamark Editor"
 msgstr ""
 
@@ -18404,6 +18485,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18413,9 +18494,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18494,6 +18575,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18501,5 +18582,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr ""
@@ -18793,5 +18874,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr ""
@@ -19308,5 +19389,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr ""
@@ -19442,10 +19523,10 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19591,10 +19672,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -19780,28 +19861,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -19812,64 +19889,68 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Salvează strat WMS în fișier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Salvează strat WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
 msgstr ""
 
@@ -19949,5 +20030,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -19980,5 +20061,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -19999,5 +20080,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr ""
@@ -20052,15 +20133,13 @@
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Contribuţii"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "Despre"
+msgstr ""
 
 #. relation type
@@ -20346,7 +20425,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Descarc datele OSM..."
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20543,6 +20621,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20551,5 +20634,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20558,5 +20641,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20565,10 +20648,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20577,5 +20660,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20585,5 +20668,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20592,15 +20675,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20609,5 +20692,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20741,5 +20824,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr ""
@@ -21278,5 +21361,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21289,5 +21372,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr ""
@@ -21591,9 +21674,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr ""
@@ -21703,9 +21786,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr ""
@@ -21964,5 +22047,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr ""
@@ -22011,5 +22094,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr ""
@@ -22044,5 +22127,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr ""
@@ -22129,5 +22212,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr ""
@@ -22162,5 +22245,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22330,14 +22413,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr ""
@@ -22605,6 +22688,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr ""
@@ -23052,5 +23135,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
@@ -23456,5 +23539,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr ""
@@ -23818,31 +23901,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr ""
@@ -23902,90 +23985,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24098,7 +24181,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr ""
@@ -24114,5 +24197,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr ""
@@ -24125,6 +24208,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr ""
@@ -24300,5 +24383,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr ""
@@ -24335,6 +24418,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr ""
@@ -24342,5 +24425,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr ""
@@ -24459,5 +24542,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr ""
@@ -24618,5 +24701,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr ""
@@ -24624,73 +24707,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr ""
@@ -24698,17 +24786,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr ""
@@ -24716,9 +24804,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr ""
@@ -24726,18 +24814,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr ""
@@ -24745,9 +24834,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr ""
@@ -24755,24 +24844,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr ""
@@ -24780,9 +24869,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr ""
@@ -24791,9 +24880,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr ""
@@ -24801,24 +24890,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr ""
@@ -24826,5 +24915,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr ""
@@ -24832,19 +24921,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -24882,5 +24971,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24888,28 +24977,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -24919,5 +25008,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -24925,5 +25014,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr ""
@@ -24931,6 +25020,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr ""
@@ -24938,5 +25027,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -24944,6 +25033,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr ""
@@ -24951,5 +25040,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -24957,46 +25046,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25004,29 +25100,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr ""
@@ -25034,25 +25130,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr ""
@@ -25061,19 +25157,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr ""
@@ -25082,9 +25178,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr ""
@@ -25092,10 +25188,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25103,5 +25199,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25109,15 +25205,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr ""
@@ -25125,55 +25221,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr ""
@@ -25181,35 +25277,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr ""
@@ -25223,6 +25319,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr ""
@@ -25638,31 +25734,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr ""
@@ -25672,240 +25768,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr ""
@@ -25947,23 +26043,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr ""
@@ -26005,211 +26101,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr ""
@@ -26217,52 +26313,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr ""
@@ -26270,204 +26366,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr ""
@@ -26475,5 +26571,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr ""
@@ -26481,10 +26577,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr ""
@@ -26492,10 +26588,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr ""
@@ -26503,10 +26599,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr ""
@@ -26515,10 +26611,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr ""
@@ -26527,10 +26623,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr ""
@@ -26540,10 +26636,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr ""
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr ""
@@ -26552,10 +26648,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr ""
@@ -26563,5 +26659,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr ""
@@ -26569,15 +26665,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr ""
@@ -26585,10 +26681,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr ""
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr ""
@@ -26596,10 +26692,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr ""
@@ -26607,5 +26703,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr ""
@@ -26613,5 +26709,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr ""
@@ -26620,10 +26716,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr ""
@@ -26632,9 +26728,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr ""
@@ -26642,10 +26738,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr ""
@@ -26654,10 +26750,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr ""
@@ -26667,5 +26763,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr ""
@@ -26674,6 +26770,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr ""
@@ -26682,66 +26778,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr ""
@@ -26750,81 +26846,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr ""
@@ -26833,5 +26929,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr ""
@@ -26839,5 +26935,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr ""
@@ -26845,25 +26941,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr ""
@@ -26872,5 +26968,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -26878,61 +26974,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr ""
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -26940,25 +27036,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr ""
@@ -26966,10 +27062,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr ""
@@ -26977,10 +27073,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr ""
@@ -26989,41 +27085,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr ""
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr ""
@@ -27033,10 +27129,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr ""
@@ -27044,5 +27140,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr ""
@@ -27050,10 +27146,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr ""
@@ -27061,10 +27157,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr ""
@@ -27072,23 +27168,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr ""
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr ""
@@ -27098,35 +27194,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr ""
@@ -27135,10 +27231,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr ""
@@ -27147,5 +27243,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -27153,10 +27249,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr ""
@@ -27167,23 +27263,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr ""
@@ -27192,20 +27288,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27213,55 +27309,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr ""
@@ -27270,5 +27366,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr ""
@@ -27276,5 +27372,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr ""
@@ -27282,5 +27378,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr ""
@@ -27288,5 +27384,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27294,5 +27390,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr ""
@@ -27300,15 +27396,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr ""
@@ -27317,5 +27413,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr ""
@@ -27323,35 +27419,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27359,5 +27455,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27366,31 +27462,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr ""
@@ -27469,39 +27565,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27510,30 +27606,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr ""
@@ -27542,10 +27638,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr ""
@@ -27554,10 +27650,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -27566,5 +27662,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27572,5 +27668,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr ""
@@ -27578,15 +27674,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -27594,10 +27690,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -27606,28 +27702,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr ""
@@ -27635,9 +27731,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr ""
@@ -27645,27 +27741,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr ""
@@ -27673,9 +27769,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr ""
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr ""
@@ -27683,9 +27779,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr ""
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr ""
@@ -27693,18 +27789,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr ""
@@ -27712,54 +27808,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr ""
@@ -27767,9 +27863,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr ""
@@ -27777,9 +27873,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -27787,54 +27883,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr ""
@@ -27842,9 +27938,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr ""
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr ""
@@ -27852,9 +27948,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr ""
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr ""
@@ -27862,24 +27958,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr ""
@@ -27887,5 +27983,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr ""
@@ -27893,97 +27989,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr ""
@@ -27991,14 +28087,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr ""
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr ""
@@ -28006,5 +28102,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr ""
@@ -28012,15 +28108,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr ""
@@ -28028,18 +28124,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr ""
@@ -28047,5 +28143,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr ""
@@ -28053,9 +28149,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr ""
@@ -28063,10 +28159,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr ""
@@ -28075,5 +28171,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28082,20 +28178,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28103,5 +28199,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr ""
@@ -28110,64 +28206,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr ""
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr ""
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr ""
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr ""
@@ -28175,15 +28271,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr ""
@@ -28191,10 +28287,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr ""
@@ -28202,25 +28298,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr ""
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr ""
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr ""
@@ -28228,5 +28324,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr ""
@@ -28234,10 +28330,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr ""
@@ -28245,10 +28341,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr ""
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -28256,5 +28352,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -28262,5 +28358,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr ""
@@ -28268,10 +28364,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr ""
@@ -28279,10 +28375,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr ""
@@ -28290,10 +28386,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr ""
@@ -28301,70 +28397,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr ""
@@ -28373,15 +28469,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr ""
@@ -28390,5 +28486,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr ""
@@ -28396,17 +28492,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr ""
@@ -28415,14 +28511,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -28430,25 +28526,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr ""
@@ -28456,10 +28552,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr ""
@@ -28467,5 +28563,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr ""
@@ -28473,5 +28569,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr ""
@@ -28480,45 +28576,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28526,25 +28622,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -28552,10 +28648,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr ""
@@ -28563,20 +28659,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr ""
@@ -28584,5 +28680,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -28590,15 +28686,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr ""
@@ -28606,9 +28702,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr ""
@@ -28616,39 +28712,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr ""
@@ -28656,15 +28752,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr ""
@@ -28672,50 +28768,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -28725,5 +28821,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr ""
@@ -28735,5 +28831,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr ""
@@ -28741,5 +28837,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr ""
@@ -28747,5 +28843,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -28756,5 +28852,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -28762,36 +28858,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -28799,5 +28895,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr ""
@@ -28806,5 +28902,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -28812,34 +28908,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr ""
@@ -28848,15 +28944,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr ""
@@ -28864,5 +28960,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr ""
@@ -28871,5 +28967,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr ""
@@ -28877,5 +28973,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr ""
@@ -28983,5 +29079,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -28992,17 +29088,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29070,5 +29166,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29078,9 +29174,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr ""
@@ -29094,10 +29190,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr ""
@@ -29105,31 +29201,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr ""
@@ -29138,30 +29234,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29388,5 +29484,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr ""
@@ -30039,4 +30135,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30140,11 +30244,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr ""
@@ -30657,5 +30761,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr ""
@@ -30669,5 +30773,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr ""
@@ -30811,13 +30915,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr ""
@@ -30831,5 +30935,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr ""
@@ -30925,10 +31029,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr ""
@@ -31030,10 +31134,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -31471,24 +31575,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -31520,6 +31624,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -31580,8 +31684,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr ""
@@ -31934,26 +32038,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr ""
@@ -32025,8 +32129,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr ""
@@ -32127,9 +32231,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr ""
@@ -32217,9 +32321,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr ""
@@ -32232,5 +32336,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr ""
@@ -32244,5 +32348,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr ""
@@ -32264,5 +32368,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr ""
@@ -32276,5 +32380,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr ""
@@ -32297,5 +32401,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr ""
@@ -32309,5 +32413,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr ""
@@ -32321,5 +32425,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr ""
@@ -32333,5 +32437,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr ""
@@ -32345,5 +32449,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr ""
@@ -32400,7 +32504,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr ""
@@ -32414,5 +32518,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr ""
@@ -32425,5 +32529,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr ""
@@ -32438,5 +32542,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr ""
@@ -32450,5 +32554,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr ""
@@ -32503,8 +32607,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr ""
@@ -32518,5 +32622,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr ""
@@ -32530,5 +32634,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr ""
@@ -32542,5 +32646,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -32554,5 +32658,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr ""
@@ -32566,5 +32670,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr ""
@@ -32642,8 +32746,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr ""
@@ -32732,12 +32836,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr ""
@@ -32887,11 +32991,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr ""
@@ -32905,5 +33009,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 22568)
+++ applications/editors/josm/i18n/po/ru.po	(revision 22569)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-15 10:25+0000\n"
-"Last-Translator: Calibrator <Unknown>\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-08-02 07:22+0000\n"
+"Last-Translator: J-Wills <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-07-28 09:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -26,5 +26,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -55,14 +55,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -79,9 +78,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -124,6 +123,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -162,5 +161,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -235,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -249,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -267,11 +266,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -279,20 +279,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -327,5 +327,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Объединить"
@@ -395,5 +395,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -407,5 +407,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -427,4 +427,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -441,6 +442,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -452,5 +453,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -586,22 +587,22 @@
 msgstr "Скачиваение открытых пакетов правок ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Объединить линию"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Объединить несколько линий в одну."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Изменить направления?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Сменить направление и объединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -611,5 +612,5 @@
 "некоторых линий?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -619,10 +620,10 @@
 "последовательностью точек."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Объединить {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Выделите не менее двух линий для объединения."
@@ -668,10 +669,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -809,5 +810,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -873,10 +874,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Экспорт в GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Экспортировать данные в GPX файл"
@@ -1072,5 +1073,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1515,20 +1516,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1552,5 +1553,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1561,6 +1562,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Ошибка"
@@ -1587,5 +1588,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1593,5 +1594,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Сохранить текущие данные."
@@ -1648,10 +1649,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Сохранить как..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Сохранить текущие данные в новый файл."
@@ -1698,5 +1699,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1723,5 +1724,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Нет, прервать"
@@ -1792,18 +1793,24 @@
 msgstr[2] "Упростить линию (удалить {0} точек)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Разделить линию"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Разделить линию в выделенной точке."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Текущее выделение невозможно разделить."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Выделенные точки не являются частью одной линии."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1812,5 +1819,5 @@
 msgstr[2] "Выделенных точек не находится в середине какой-либо линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1829,21 +1836,10 @@
 "выберите также линию."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Выделенные точки не являются частью одной линии."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Выделенная линия не содержит все выделенные точки"
-msgstr[1] "Выбранная линия не содержит выбранных точек"
-msgstr[2] "Выделенная линия не содержит все выбранные точки"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Чтобы разделить замкнутую линию, выделите не менее двух точек."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1853,5 +1849,5 @@
 "линии)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1862,5 +1858,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1870,5 +1866,5 @@
 "необходимо проверить и исправить, если потребуется.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2020,5 +2016,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3072,22 +3068,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3233,26 +3229,26 @@
 msgstr "Невозможно уладить конфликт"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 "Требуется удалить, по крайней мере, один объект, получена пустая коллекция"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Удалить точку {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Удалить линию {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Удалить отношение {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3262,5 +3258,5 @@
 msgstr[2] "Удалить {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3270,5 +3266,5 @@
 msgstr[2] "Удалить {0} точек"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3278,5 +3274,5 @@
 msgstr[2] "Удалить {0} линий"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3286,5 +3282,5 @@
 msgstr[2] "Удалить {0} отношений"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3445,5 +3441,5 @@
 msgstr "Применить?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3510,30 +3506,30 @@
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
-msgstr ""
+msgstr "Невозможно создать директорию {0}! Автосохранение будет отключено"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
-msgstr ""
+msgstr "Невозможно содать файл {0}. Будет использовано другое имя файла"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Ошибка чтения файлов в каталоге {0}\n"
+msgstr "Ошибка ввода-вывода при создании файла. Автосохранение пропущено: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Удалить старый файл модуля {0}"
+msgstr "Невозможно удалить старый бэкап файл {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Ошибка создания директории кэша: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
-msgstr ""
+msgstr "Невозножно открфыть автосохранённые данные osm ({0}) - {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
@@ -3724,42 +3720,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Градусы, минуты, секунды"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Предполагаемые координаты"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "Ю"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "С"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "З"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "В"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3768,5 +3767,5 @@
 "Невозможно добавить примитив {0} к набору данных, так как он уже присутствует"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3946,5 +3945,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "фон"
@@ -4091,5 +4090,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Не показывать снова (запомнить выбор)"
@@ -4117,5 +4116,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "железная дорога"
@@ -4137,6 +4136,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4206,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "здание"
@@ -4292,5 +4291,5 @@
 msgstr "Объект удалён"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4391,70 +4390,70 @@
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "использование"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Показать эту справку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Стандартный параметр геометрии unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Скачать область в пределах рамки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Открыть файл (любой тип файлов, который можно открыть с помощью Файл/Открыть)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Скачать область в пределах рамки, как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Скачать расположение с URL (с lat=x&lon=y&zoom=z) как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Выбор с учетом поиска"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Запуск в развернутом виде"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Восстановить настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Указать язык"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "системные настройки Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Сменить папку для всех настроек пользователя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4468,9 +4467,9 @@
 "максимальный размер выделенной памяти"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "примеры"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4480,5 +4479,5 @@
 "порядке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
@@ -4486,42 +4485,41 @@
 "selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Инициализация"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Обновление модулей..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Установка обновлённых модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Загрузка ранних модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Создание интерфейса"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Загрузка модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+msgstr "Несохранённый данные osm"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Устранить"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr "Восстановить"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4530,5 +4528,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4626,33 +4624,33 @@
 msgstr "Уменьшить масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Географическая долгота положения курсора"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Название объекта, на который наведён курсор"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Географическая широта положения курсора"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Угол между предыдущим и текущим сегментом линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Путевой угол создаваемого сегмента"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Длина создаваемого сегмента линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4662,9 +4660,9 @@
 "<br>Удерживайте CTRL, чтобы выбрать мышкой, напрямую из списка.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(нет объекта)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4680,4 +4678,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Слой ''{0}'' должен быть в списке слоёв"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Числовое"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "китайская"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Деловая территория"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5437,5 +5450,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "все"
@@ -5519,6 +5532,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5530,5 +5543,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5680,5 +5693,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Пакеты правок"
@@ -5739,5 +5752,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5903,5 +5916,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5909,5 +5922,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5915,5 +5928,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5921,5 +5934,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5927,5 +5940,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5934,5 +5947,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5940,5 +5953,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5946,5 +5959,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5952,24 +5965,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Фильтр активен</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> объектов скрыто"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "Отключено редактирование <b>{0}</b> объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6050,51 +6063,51 @@
 msgstr "Закрыть диалог, не создавая новую точку"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Слои"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Показать список всех загруженных слоёв."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Удалить выбранные слои."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Показать/скрыть выделенный слой"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Показать/скрыть"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Показать/скрыть выделенный слой"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Включить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Активировать выделенный слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Объединить этот слой с другим слоем"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Дублировать этот слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Переместить выделенный слой вверх."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Переместить выделенный слой вниз."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Информация о слое"
@@ -6104,5 +6117,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Отношения"
@@ -7272,6 +7285,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7319,107 +7333,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Название"
@@ -7800,5 +7814,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7891,5 +7905,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<различные>"
@@ -8682,5 +8696,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Границы"
@@ -8753,8 +8767,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Тип"
@@ -8783,6 +8797,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "неизвестно"
@@ -9139,5 +9153,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Обнаружены конфликты"
@@ -9212,14 +9226,15 @@
 "образцу"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Прокомментируйте данные, загружаемые на сервер:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Введите комментарий для загрузки на сервер (мин. 3 символа)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "неверный комментарий загрузки на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "ID пакета правок:"
@@ -9716,5 +9731,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Передать на сервер"
@@ -9736,5 +9751,5 @@
 msgstr "Инициализация отношений для обновления ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9742,19 +9757,19 @@
 msgstr "Настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 "Решить, как передать данные на сервер и какие использовать пакеты правок"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Теги нового пакета правок"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Применить теги на пакет правок, который загружен"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
@@ -9762,45 +9777,77 @@
 "сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Задать расширенные настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Передать на сервер в ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Передать изменения на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Передать на сервер изменённые элементы"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-"Пожалуйста, введите комментарий для этой загрузки на сервер пакета правок "
-"(мин. 3 символа)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "неверный комментарий загрузки на сервер"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "В обратном порядке"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Продолжить"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Отменить и вернуться в редактор"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Больше не показывать"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Please enter a valid chunk size first"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Неправильный размер куска"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Отменить загрузку на сервер и продолжить редактирование"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -10184,109 +10231,11 @@
 msgstr[2] "Удалить {0} объектов:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "точка GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Настроить отрисовку линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Использовать глобальные настройки."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Отображать линии между точками для этого слоя."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Не отображать линии между точками для этого слоя."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Выбрать варианты отрисовки линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Выбрать цвет"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "По умолчанию"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Выбор цвета"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Маркеры из именованых точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Именованные точки трека из {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Импортировать аудиофайлы"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>Данные в слое GPX ''{0}'' были скачаны с сервера.<br>Так как путевые "
-"точки не содержат меток времени, мы не можем синхронизировать их с "
-"аудиоданными.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Импорт невозможен"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Аудиофайлы Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Аудиомаркеры из {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Импорт изображений"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html>Данные в слое GPX ''{0}'' были скачаны с сервера.<br>Так как путевые "
-"точки не содержат меток времени, мы не можем синхронизировать их с "
-"изображениями.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10294,5 +10243,5 @@
 msgstr "Название: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10300,5 +10249,5 @@
 msgstr "Описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10309,23 +10258,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Описание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Период"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Длина"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Длина: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10335,5 +10284,5 @@
 msgstr[2] "{0} маршрутов, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10343,10 +10292,10 @@
 msgstr[2] "{0} путевых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Преобразовать в слой данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10356,21 +10305,21 @@
 "считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Преобразовано из: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10378,10 +10327,10 @@
 msgstr "Скачать с OSM данные вдоль этого трека"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Скачать всё в пределах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10389,10 +10338,10 @@
 msgstr "{0} метров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Максимальная область для одного запроса:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10400,21 +10349,21 @@
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr "Загрузить возле:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr "только трек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr "только дорожные точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr "треки и дорожные точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10426,9 +10375,9 @@
 "Продолжить?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10438,5 +10387,5 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10446,24 +10395,122 @@
 "проигнорированы при расчете времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Настроить отрисовку линий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Использовать глобальные настройки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Отображать линии между точками для этого слоя."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Не отображать линии между точками для этого слоя."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Выбрать варианты отрисовки линий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Выбрать цвет"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "По умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Выбор цвета"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Маркеры из именованых точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Именованные точки трека из {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Импортировать аудиофайлы"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>Данные в слое GPX ''{0}'' были скачаны с сервера.<br>Так как путевые "
+"точки не содержат меток времени, мы не можем синхронизировать их с "
+"аудиоданными.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Импорт невозможен"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Аудиофайлы Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Аудиомаркеры из {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Импорт изображений"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>Данные в слое GPX ''{0}'' были скачаны с сервера.<br>Так как путевые "
+"точки не содержат меток времени, мы не можем синхронизировать их с "
+"изображениями.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Слой данных {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "вне области для скачивания"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 "Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10473,11 +10520,11 @@
 msgstr[2] "Обнаружено {0} конфликтов."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Нажмите, чтобы закрыть этот диалог и продолжить правку"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10487,36 +10534,36 @@
 msgstr[2] "{0} удалено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} состоит из:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "отключено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "Версия API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Преобразовать в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Тест согласованности набора данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "Проблемы не обнаружены"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Обнаружены следующие проблемы:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10527,5 +10574,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10535,5 +10582,5 @@
 msgstr[2] "треков"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10542,5 +10589,5 @@
 msgstr[2] "точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10550,5 +10597,5 @@
 msgstr[2] "трек с {0} точками"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10558,5 +10605,5 @@
 msgstr[2] "{0} состоит из {1} треков"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10566,24 +10613,28 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Относятся к GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Файлы GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Файл {0} загружен под именем \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Ошибка разбора {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Невозможно прочитать \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10595,34 +10646,34 @@
 "прочитаете на фото и выберите часовой пояс <hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Время фотоснимка (из EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Время GPS (прочтите на фото вверху): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [дд/мм/гггг чч:мм:сс]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Я нахожусь в часовом поясе: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Без даты"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Открыть другое фото"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Синхронизировать время по фотографии из GPS-приемника"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10632,21 +10683,21 @@
 "Пожалуйста, используйте запрашиваемый формат"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Недопустимая дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Не загружены треки GPX>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "Трек GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Открыть другой трек GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10655,72 +10706,72 @@
 "приёмника GPS</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Авто-Угадывание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr "Первая фотография соответствует первой точке gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Ручная регулировка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "Переустановить позицию для: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Изображения с координатами местоположения в данных exif ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Помечено изображений ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Показать эскиз изображения на карте"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Часовой пояс: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Смещение:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Сопоставить изображения с GPX треком"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Установить соотношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Недопустимый часовой пояс"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Недопустимое смещение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Попытаться снова"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "Нет соответствующих изображений!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "Нет выбранных gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10731,20 +10782,20 @@
 msgstr[2] "<html><b>{0}</b> из <b>{1}</b> фото соответствует треку GPX.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часовой пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Минуты: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунды: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10754,5 +10805,5 @@
 msgstr[2] "(Расхождение во времени {0} дней)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10762,21 +10813,21 @@
 "можете вручную совместить фотографии с помощью движков."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Не удалось сопоставить фотографии треку"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Настройка часового пояса и смещения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "Выбранные фотографии не содержат информацию о времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Фотографии не содержат информацию о времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10785,17 +10836,17 @@
 "Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX трек не содержит информации о времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Необходимо выбрать трек GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Трек GPX не выделен"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10806,5 +10857,5 @@
 "Ожидаемый формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10815,56 +10866,52 @@
 "Ожидаемый формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Извлечение GPS координат из EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Запуск сканирования каталога"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "Один из выделенных файлов пуст"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Прочитать фотографии..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Чтение {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Не удалось получить канонический путь к каталогу {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Скнирование каталога {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Найден пустой файл в каталоге {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Ошибка чтения файлов в каталоге {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Изображения с данными о местоположении"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Относятся к GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10874,5 +10921,5 @@
 msgstr[2] "Загружено {0} изображений."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10882,10 +10929,10 @@
 msgstr[2] "{0} найдено, помеченным GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Удалить изображение с диска"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10896,5 +10943,5 @@
 "утерян!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "Невозможно удалить файл изображения."
@@ -10996,9 +11043,9 @@
 msgstr "Изображения JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "маркер GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -11007,5 +11054,5 @@
 msgstr[2] "маркеров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -11015,9 +11062,22 @@
 msgstr[2] "{0} состоит из {1} маркеров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"Нет существующих аудио маркеров на этом слое от корорых можно сделать сдвиг"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "Показать Текст/Пиктограммы"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Показать/скрыть текст и значки маркеров."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Синхронизировать аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -11026,5 +11086,5 @@
 "синхронизации."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -11032,14 +11092,14 @@
 msgstr "Аудио синхронизировано на точке {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Не удалось синхронизировать в воспроизводимом слое."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Установить маркер аудио на позиции проигрывания"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -11048,17 +11108,4 @@
 "Вы должны поставить аудио на паузу в той точке пути, где хотите поставить "
 "маркер."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"Нет существующих аудио маркеров на этом слое от корорых можно сделать сдвиг"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr "Показать Текст/Пиктограммы"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Показать/скрыть текст и значки маркеров."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -12017,4 +12064,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Нет"
@@ -12029,5 +12077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -12134,5 +12182,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -12142,5 +12190,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Только в начале пути"
@@ -12170,5 +12218,20 @@
 msgstr "Создавать маркеры, читая GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Автор"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "дизельное"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Лодка"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12177,9 +12240,9 @@
 "Автоматически создавать слой меток из путевых точек при открытии GPX слоя"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Рисовать линии между точками GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12189,9 +12252,9 @@
 "чтобы рисовать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Максимальная длина для локальных файлов (в метрах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12200,20 +12263,20 @@
 "чтобы отображать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Максимальная длина (в метрах)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Отображать линии, даже если нет импортированой информации о линиях."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Отображать стрелки на линиях, соединяющих точки GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12222,5 +12285,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12228,13 +12291,13 @@
 msgstr "Не отображать стрелки, если они находятся близко от предыдущих стрелок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Минимальное расстояние (в пикселях)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Отображать точки GPS более жирно"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12244,9 +12307,9 @@
 "Менеджере Слоев."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Цвета точек и сегментов треков по скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12256,46 +12319,55 @@
 "устройство захвата требует регистрации этой информации."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Позволяет настраивать окраску трека для различных средних скоростей."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Раскрасить треки и точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "Описание путевой точки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "Точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Показывать направление на сегментах путей."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показывать порядковые номера на всех сегментах линии."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Применить сглаживание карты."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Отображать границы области, скачанной с сервера."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Отображать неактивные слои данных другим цветом."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Данные OSM"
@@ -12683,21 +12755,26 @@
 msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Тип проекции"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Код проекции"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Отображать координаты как"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Тип проекции"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Код проекции"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Слой для проведения измерений"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Картографическая проекция"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -13314,5 +13391,5 @@
 msgstr "Добавить новый тег"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -13323,49 +13400,49 @@
 "display_values должно быть такое же, как и в values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Подробнее"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Неизвестный запрос: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "Доступные роли"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr "роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr "количество"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr "элементы"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Дополнительные атрибуты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестный тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr "Заготовка элемента роли без родителей"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr "Заготовка вложенного элемента без родителей"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13375,15 +13452,15 @@
 msgstr "Не удалось прочитать источник заготовок тегов: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Ошибка при разборе {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Элемент типа {0} не поддерживается."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13394,17 +13471,17 @@
 msgstr[2] "Изменить {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Ничего не выделено!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Неудачный выбор!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Применить заготовку"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13422,7 +13499,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Поиск: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -13431,17 +13507,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Поиск объектов"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Показать русифицированное название в списках выбора"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Поиск: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13764,5 +13837,5 @@
 msgstr "Парсинг файла \"{0}\" потерпел неудачу"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ошибка разбора: неправильная структура документа gpx"
@@ -15384,5 +15457,5 @@
 "<br><br>Сообщение об ошибке:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15680,5 +15753,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
@@ -16113,41 +16186,41 @@
 msgstr "Больше не показывать"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "Адрес здания"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "Номер дома:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Улица:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Увеличивать"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Уменьшать"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Номера:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr "Режим большх зданий"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr "Повернуть прицел"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr "Расширенные настройки"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr "Тег здания:"
@@ -16164,25 +16237,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Задать размеры зданий"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "Использовать диалог адреса"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr "Авто-выбор здания"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Ширина зданий:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr "Шаг длины:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr "Дополнительно ..."
@@ -16220,18 +16293,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Здания"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr "Next no"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Улица"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr "Ввести адреса"
@@ -16408,7 +16481,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
-#, fuzzy
 msgid "Use \"Tableau d''assemblage\""
-msgstr "Выберите Таблицу d'Assemblage"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -16474,8 +16546,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "вода"
@@ -16536,6 +16608,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "адрес"
@@ -17037,34 +17109,34 @@
 "Выберите сначала один из них, а затем повторите."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Пустой слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "слой WMS ({0}), квадратов загружено: {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Не векторизованны."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Размер растра: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "Векторизован."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Общий квадрат: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -17075,14 +17147,14 @@
 "Создайте новый файл."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Ошибка формата кеша"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 msgid "Cache Lambert Zone Error"
 msgstr "Ошибка кеширования зоны Ламберта"
@@ -17162,22 +17234,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Скачать объект .."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Скачать данные карты, лежащие на конце выбранной линии"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Скачать с сервера сейчас"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Выберите хотя бы один тип данных для скачивания."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -17187,12 +17255,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Тест {0}/{1}: Идёт {2}"
+msgstr "между {0} {1} и {2} {3}"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Ошибка разбора {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -17223,9 +17291,9 @@
 msgstr "Создать копию линии"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Слой для редактирования GPX треков"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Преобразовать в GPX слой с обезличенным временем"
@@ -17235,5 +17303,5 @@
 msgstr "EditGpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "Править GPX треки"
@@ -17242,11 +17310,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Импортировать путь из слоя данных GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Очистить существующий путь"
@@ -17256,5 +17324,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Не найдено слоя данных GPX"
@@ -17264,13 +17332,13 @@
 msgstr "В дочерний скрипт попали неверные данные."
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr "Инструмент редактирования"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr "Название:"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr "CmdLine:"
@@ -17512,5 +17580,5 @@
 msgstr "Показать фотографии без геотегов"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Импортированные изображения"
@@ -17876,8 +17944,6 @@
 msgstr "Открыть окно измерений"
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Сброс"
@@ -17908,5 +17974,5 @@
 msgstr "Угол между двумя выделенными точками"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Слой для проведения измерений"
@@ -18000,5 +18066,5 @@
 msgstr "Цикл скачивания из OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Отображает проблемы из OpenStreetBugs"
@@ -18070,13 +18136,13 @@
 msgstr "Очередь"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "не в сети"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "в сети"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -18194,63 +18260,67 @@
 msgstr "исполняемый файл Firefox"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "Ошибка чтения!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "Ошибка записи!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "Записать координаты в шапку изображения"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr "Записать информацию о положении в шапку exif следующих файлов:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "настройки"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "сохранить резервный файл"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "поменять время внесения изменений:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "на время по gps"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "на предыдущее значение (неизменённое mtime)"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr "Модуль геопометки фотографии"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "Запись информации о местоположении в файлы изображений..."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "Невозможно прочитать mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "Невозможно записать mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "Файл не может быть удалён!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "Файл не может быть переименован!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
@@ -18258,32 +18328,28 @@
 "h3>"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "Переписать старые файлы резервного копирования?"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "Сохранить старые файлы резервного копировния и продолжить"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "Перезаписать"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "Невозможно удалить временный файл!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "Тест не прошёл: Невозможно прочитать mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "Тест не прошёл: Невозможно записать mtime."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "Записать координаты в шапку изображения"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -18324,9 +18390,9 @@
 msgstr "Новый слой изображения из файла..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "Изображение создано неудачно."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "Невозможно найти объект на карте."
@@ -18504,20 +18570,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "Разрешённая версия:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "подтверждать все действия удалённого управления вручную."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Модуль, позволяющий другим приложениям управлять JOSM"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Дистанционное управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Настройки модуля дистанционного управления"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18529,35 +18600,37 @@
 "подключающихся к модулю."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Разрешённые действия"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 "модуль дистанционного управления получил запрос на загрузку данных из API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Подробности запроса: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Разрешить действие?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Подтверждение действия дистанционного управления"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr "Модулем дистанционного управления было предложено создать новую точку."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -18565,17 +18638,23 @@
 "следующей ссылке:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr "Полнростью вернуть пакет правок"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr "Вернуть только выделенное"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr "Вернуть выделенное и восстановить удалённые объекты"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -18583,5 +18662,5 @@
 msgstr "Откатить пакет правок"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Откатить"
@@ -18782,41 +18861,41 @@
 msgstr "Удалить ненужные точки из области."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Быстрая карта"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Автомасштабирование"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Загрузить квадрат карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "Показать данные квадрата"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Загрузить все квадраты карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Увеличить масштаб"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Уменьшить масштаб"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "Привязаться к размеру квадрата"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Очистить кеш квадратов карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "изображение "
@@ -19121,4 +19200,14 @@
 msgid "Terrace"
 msgstr "Ряд домов вдоль улицы"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Разделитель"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19900,6 +19989,6 @@
 msgstr "Добавьте отсутствующий тег {0}={1}"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19912,9 +20001,9 @@
 "соединяется с линией <span class=\"object-name\">{3}</span>."
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr "Разделить сейчас"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr "Разделяет линию"
@@ -19997,6 +20086,6 @@
 msgstr "Найдено {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -20004,5 +20093,5 @@
 msgstr "Ошибки при проверке"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Проверка не выявила ошибок"
@@ -20247,32 +20336,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Объединить дубликаты точек?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Дублированные точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Дублированные точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Объединить дубликаты точек?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Дублированные точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Объединить дубликаты точек?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -20311,5 +20394,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Мультиполигон"
@@ -20840,5 +20923,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "полигон"
@@ -20977,10 +21060,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr "Показывает текущее положение для видеофрагмента"
@@ -21129,10 +21212,10 @@
 "Невозможно прочитать информацию из \"walking-papers.org\" по id \"{0}\""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -21338,9 +21421,5 @@
 "Это может привести к ошибочным координатам."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Автоматическое скачивание"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21349,19 +21428,19 @@
 "искажена"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(деактивировано)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -21376,17 +21455,17 @@
 "попытаться извлечь квадраты WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Да, выбрать изображения"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "Ошибочная ссылка?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Скачать видимые квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21395,33 +21474,33 @@
 "измените разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Изменить разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Загрузить заново ошибочные квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Альфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Сохранить слой WMS в файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Сохранить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Загрузить слой WMS из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Загрузить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -21429,15 +21508,19 @@
 "Неподдерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Ошибка формата файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Ошибка при загрузке файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Установить закладку WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Автоматическое скачивание"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -21516,5 +21599,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -21551,5 +21634,5 @@
 msgstr "Аудиоустройство недоступно"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -21572,5 +21655,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "лесопосадки"
@@ -21583,33 +21666,28 @@
 #. relation type
 #: build/specialmessages.java:17
-#, fuzzy
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr "создать отношение associatedStreet"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "граница"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Увеличивать"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "высоковольтная"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
@@ -21618,26 +21696,22 @@
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Сеть"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "общественный транспорт"
+msgstr "общественный_транспорт"
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Ограничение"
+msgstr "ограничение"
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
@@ -21646,15 +21720,13 @@
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "окрестность"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "водоём"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -21939,7 +22011,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Скачать с OSM данные вдоль этого трека"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -22174,6 +22245,11 @@
 msgstr "Сделать ряд домов вдоль улицы из одного блока."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22185,5 +22261,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22194,5 +22270,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22203,10 +22279,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr "Позволяет восстанавливать объекты, удаленные из базы данных OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22218,5 +22294,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22229,5 +22305,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22238,15 +22314,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Быстрое скачивание вдоль большого набора связанных линий"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Выделить последовательность неветвящихся соединённых линий"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22258,5 +22334,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22391,5 +22467,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Обозначение"
@@ -22928,5 +23004,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "металл"
@@ -22939,5 +23015,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "древесина"
@@ -23241,9 +23317,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "да"
@@ -23353,9 +23429,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "нет"
@@ -23614,5 +23690,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "дорога местного значения"
@@ -23661,5 +23737,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "служебный проезд"
@@ -23694,5 +23770,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "строящаяся дорога"
@@ -23779,5 +23855,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "туристический"
@@ -23812,5 +23888,5 @@
 msgstr "хорошее"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "средний"
@@ -23980,14 +24056,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Оператор"
@@ -24255,6 +24331,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Высота над уровнем моря"
@@ -24702,5 +24778,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "открытое болото"
@@ -25106,5 +25182,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Напряжение"
@@ -25468,31 +25544,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Часы работы"
@@ -25552,90 +25628,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
@@ -25748,7 +25824,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Справочный номер"
@@ -25764,5 +25840,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "подземная"
@@ -25775,6 +25851,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Денежный сбор"
@@ -25950,5 +26026,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Инвалидное кресло"
@@ -25985,6 +26061,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Навес"
@@ -25992,5 +26068,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Скамейка"
@@ -26109,5 +26185,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Бакен"
@@ -26268,5 +26344,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Кухня"
@@ -26274,73 +26350,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "итальянская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "китайская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "пицца"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "бутерброды"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "греческая"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "немецкая"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "индийская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "местная"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "шашлык"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "турецкая"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "азиатская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "тайская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "мексиканская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "японская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "французская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "сэндвичи"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "суши"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Ресторан быстрого питания"
@@ -26348,17 +26429,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Свофства ресторана быстрого питания"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "рыба и чипсы"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "курятина"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Кафе"
@@ -26366,9 +26447,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Свойства кафе"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Пивная"
@@ -26376,18 +26457,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Свойства пивной"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Пивной сад"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Свойства пивного сада"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Бар"
@@ -26395,9 +26477,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Свойства бара"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Ночной клуб"
@@ -26405,24 +26487,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Свойства ночного клуба"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Достопримечательность"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Свойства достопримечательности"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Музей"
@@ -26430,9 +26512,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Свойства музея"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -26441,9 +26523,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Свойства зоопарка"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Место с хорошим видом"
@@ -26451,24 +26533,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Свойства смотровой площадки"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Наблюдательная вышка"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Парк развлечений"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Свойства парка развлечений"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Произведения искусства"
@@ -26476,5 +26558,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Свойства произведений искусств"
@@ -26482,19 +26564,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Справочное бюро"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Тип карты"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "топографическая"
@@ -26532,5 +26614,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26538,28 +26620,28 @@
 msgstr "карта улиц"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "план-схема"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Показанная область"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "окрестность"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "город"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "регион"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Подробное описание"
@@ -26569,5 +26651,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Показаны маршруты:"
@@ -26575,5 +26657,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "пешие"
@@ -26581,6 +26663,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "велосипедные"
@@ -26588,5 +26670,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "для горного велосипеда"
@@ -26594,6 +26676,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "лыжные"
@@ -26601,5 +26683,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "конные"
@@ -26607,46 +26689,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "...другие возможные способы передвижения"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Информационный стенд"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Содержимое указателя"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "объявления"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "животный мир"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Указатель направлений"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "столб"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Информационная стойка"
@@ -26654,29 +26744,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Подробное описание"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Аудиогид"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Аудиогид через мобильный телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Номер телефона"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Другие справочные бюро"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Свойства навеса"
@@ -26684,25 +26774,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Очаг"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Место для пикника"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "свойства места для пикника"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Исторические места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Замок"
@@ -26711,19 +26801,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Свойства замка"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Развалины"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Свойства развалин"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Археологические раскопки"
@@ -26732,9 +26822,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Свойства археологических раскопок"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Поле битвы"
@@ -26742,10 +26832,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Свойства поля битвы"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Палеонтологические раскопки"
@@ -26753,5 +26843,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Свойства палеонтологических раскопок"
@@ -26759,15 +26849,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Монумент"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Свойства монумента"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Памятник"
@@ -26775,55 +26865,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Свойства памятника"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Свойства придорожного креста"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Придорожная святыня"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Свойства придорожной святыни"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Пограничный камень"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Свойства пограничного камня"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Досуг"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Свойства аквапарка"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Игровая площадка"
@@ -26831,35 +26921,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Свойства игровой площадки"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Место для рыбалки"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Свойства места для рыбалки"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Спортивные сооружения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Свойства стадиона"
@@ -26873,6 +26963,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "вид спорта:"
@@ -27288,31 +27378,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "спорт"
@@ -27322,240 +27412,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "несколько"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "стрельба из лука"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr "американский_футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "австралийский футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "бочче"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "боулз"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr "канадский_футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "гребля на каное / каяке"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "скалолазание"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "тренировочные сетки для крикета"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "собачьи бега"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "конный спорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr "гаэльский_футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "хоккей"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "лошадиные бега"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "моторный спорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "пелота"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "ракетбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr "лига_регби"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr "объединение_регби"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "стрельба"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "фигурное катание"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "плавание"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "настольный теннис"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "теннис"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Спортивный центр"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Свойства спортивного центра"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Спортивное поле"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Свойства спортивного поля"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Трек"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Свойства трека"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Поле для гольфа"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Свойства поля для гольфа"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Поле для минигольфа"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Свойства поля для минигольфа"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Многоборье"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Править Многоборье"
@@ -27597,23 +27687,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "вид"
@@ -27655,211 +27745,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "спортивное поле"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "спортивный центр"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "трек"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Боулинг (10-кегельный)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Свойства боулинга"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Свойства атлетики"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Стрельба из лука"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Свойства стрельбы из лука"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Скалолазание"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Свойства скалолазания"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Гребля на каное / каяке"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Свойства гребли на каное / каяке"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Свойства велоспорта"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Собачьи бега"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Свойства собачьих бегов"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Конный спорт"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Править конный спорт"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Лошадиные бега"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Править лошадиные бега"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Свойства гимнастики"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Мотоспорт"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Свойства моторных видов спорта"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Фигурное катание"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Свойства фигурного катания"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Скейтбординг"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Свойства скейтбординга"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Плавание"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Свойства плавания"
@@ -27867,52 +27957,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Свойства лыжного спорта"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Тип лыжни"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "горные лыжи"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "беговые лыжи"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "снежный парк"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Сложность"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "начальный"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "лёгкий"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "сложный"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "очень сложный"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "фрирайд"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Стрельба"
@@ -27920,204 +28010,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Свойства стрельбы"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Спорт (с мячом)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Футбол (европейский)"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Свойства футбола"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Австралийский футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Свойства австралийского футбола"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr "Американский футбол"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr "Свойства Американского футбола"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr "Канадский футбол"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr "Свойства Канадского футбола"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr "Гаэльский футбол"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr "Свойства Гаэльского футбола"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr "Лига регби"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr "Свойства лиги регби"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr "Объединение регби"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr "Свойства объединения регби"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Свойства бейсбола"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Свойства бейсбола"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Гольф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Свойства гольфа"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "поле для гольфа"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Бочче"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Свойства бочче"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Боулз"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Свойства боулз"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Свойства крикета"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Тренировочные сетки для крикета"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Свойства тренировочных сеток для крикет"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Свойства крокета"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Хоккей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Свойства хокея"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Свойства пелоты"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Ракетбол"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Свойства ракетбола"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Свойства настольного тенниса"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Теннис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Свойства тенниса"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Рукотворное"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Здание"
@@ -28125,5 +28215,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Общественное здание"
@@ -28131,10 +28221,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Свойства общественного здания"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Муниципалитет"
@@ -28142,10 +28232,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Свойства муниципалитета"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Посольство"
@@ -28153,10 +28243,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Свойства посольства"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Суд"
@@ -28165,10 +28255,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Свойства суда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Тюрьма"
@@ -28177,10 +28267,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Свойства тюрьмы"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Полиция / милиция"
@@ -28190,10 +28280,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "свойства полиции / милиции"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Пожарное депо"
@@ -28202,10 +28292,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Свойства пожарного депо"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Почтовое отделение"
@@ -28213,5 +28303,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Свойства почтамта"
@@ -28219,15 +28309,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Детский сад"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Свойства детского сада"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Школа"
@@ -28235,10 +28325,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Свойства школы"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Вуз"
@@ -28246,10 +28336,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Свойства вуза"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Профессиональное училище"
@@ -28257,5 +28347,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Свойства профессионального училища"
@@ -28263,5 +28353,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Кинотеатр"
@@ -28270,10 +28360,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Свойства кинотеатра"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Библиотека"
@@ -28282,9 +28372,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Свойства библиотеки"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Центр искусств"
@@ -28292,10 +28382,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Свойства центра искусств"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Театр"
@@ -28304,10 +28394,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Свойства театра"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Культовое место"
@@ -28317,5 +28407,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Свойства культового места"
@@ -28324,6 +28414,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Религия"
@@ -28332,66 +28422,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "бахаи"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "буддизм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "христианство"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "индуизм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "джайнизм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "иудаизм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "ислам"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "сикхизм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "спиритуализм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "даосизм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "унитарианство"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Конфессия"
@@ -28400,81 +28490,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "англиканская"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "баптисты"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "католики"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "евангелисты"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "свидетели иеговы"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "лютеране"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "методисты"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "мормоны"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "православные"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "пятидесятники"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "пресвитериане"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "протестанты"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "квакеры"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "шииты"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "сунниты"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Адреса"
@@ -28483,5 +28573,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Правка адресов"
@@ -28489,5 +28579,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Номер дома"
@@ -28495,25 +28585,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Название дома"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Улица"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Город"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Почтовый индекс"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Код страны"
@@ -28522,5 +28612,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Править интерполяцию адресов"
@@ -28528,61 +28618,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Схема нумерации"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "нечётные"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "чётные"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "алфавитный"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Рукотворное"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Цеха"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Свойства цехов"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Башня"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Свойства башни"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Назначение башни"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "связная"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "наблюдательная"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Высота (в метрах)"
@@ -28590,25 +28680,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Свойства водонапорной башни"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Свойства газгольдера"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -28616,10 +28706,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Свойства маяка"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Ветряная мельница"
@@ -28627,10 +28717,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Свойства ветряной мельницы"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Трубопровод"
@@ -28639,41 +28729,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Свойства трубопровода"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "теплотрасса"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "нефть"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "канализация"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "любого назначения"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Расположение"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "подводная"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "надземная"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
@@ -28683,10 +28773,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Свойства чистных сооружений"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Кран"
@@ -28694,5 +28784,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Свойства крана"
@@ -28700,10 +28790,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Свойства бакена"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Геодезический пункт"
@@ -28711,10 +28801,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Свойства геодезического пункта"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Камера наблюдения"
@@ -28722,23 +28812,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Свойства камеры наблюдения"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "внутренняя"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "внешняя"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "общедоступное"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Электростанция"
@@ -28748,35 +28838,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Свойства электростанции"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "ветряная"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "гидро"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "тепловая"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "атомная"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "угольная"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "солнечная"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Электроподстанция"
@@ -28785,10 +28875,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Свойства электроподстанции"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Трансформаторная будка"
@@ -28797,5 +28887,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Свойства трансформаторной будки"
@@ -28803,10 +28893,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Табличка на линии электропередач"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Опора ЛЭП"
@@ -28817,23 +28907,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Свойства опоры ЛЭП"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "вышка"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "столб"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Номер вышки"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Линия электропередач"
@@ -28842,78 +28932,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Свойства линии электропередач"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Тип линии"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
 msgstr "высоковольтная"
 
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "среднего / низкого напряжения"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Количество токонесущих кабелей (без грозозащитных)"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Расщепление фаз (число раздельных проводов)"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "один провод"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "два провода"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "три провода"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "четыре провода"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Туалет"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "ограничено"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Примечание"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Почтовый ящик"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Телефон"
@@ -28922,5 +29010,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Свойства телефона"
@@ -28928,5 +29016,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Монеты"
@@ -28934,5 +29022,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Банкноты"
@@ -28940,5 +29028,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Электронные средства оплаты"
@@ -28946,5 +29034,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Дебетные карты"
@@ -28952,15 +29040,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Кредитные карты"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Пункт приёма утильсырья"
@@ -28969,5 +29057,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Свойства пункта приёма утильсырья"
@@ -28975,35 +29063,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Батарейки"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Консервные банки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Одежда"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Стекло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Бумага"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Металлолом"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Урна для мусора"
@@ -29011,5 +29099,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Свойства урны для мусора"
@@ -29018,31 +29106,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Спинка"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "камень"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "пластик"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Цвет"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "чёрный"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "коричневый"
@@ -29121,39 +29209,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "зелёный"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "красный"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "синий"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "серый"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "белый"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Количество мест"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Охотничья вышка"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Свойства охотничьей вышки"
@@ -29162,30 +29250,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Высота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "низкая"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "половинная"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "полная"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Скрытая"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Запирается"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Фонтан"
@@ -29194,10 +29282,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Свойства фонтана"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Питьевая вода"
@@ -29206,10 +29294,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Свойства питьевой воды"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Пожарный кран"
@@ -29218,5 +29306,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Свойства пожарного крана"
@@ -29224,5 +29312,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Детский дом"
@@ -29230,15 +29318,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Свойства детского дома"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Магазины, служба быта"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Автомагазин"
@@ -29246,10 +29334,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Свойства автомагазина"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Веломагазин"
@@ -29258,28 +29346,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Свойства веломагазина"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Свойства супермаркета"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Бытовая химия"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Свойства магазина бытовой химии"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Небольшой магазин"
@@ -29287,9 +29375,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Свойства магазина шаговой доступности"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Киоск"
@@ -29297,27 +29385,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Свойства киоска"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Книжный магазин"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Свойства книжного магазина"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Туристическое агенство"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Свойства туристического агентства"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Мясная лавка"
@@ -29325,9 +29413,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Свойства мясной лавки"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Булочная"
@@ -29335,9 +29423,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Свойства булочной"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Цветочный магазин"
@@ -29345,18 +29433,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Свойства цветочного магазина"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Натуральные продукты"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Свойства магазина натуральных продуктов"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Алкогольная продукция"
@@ -29364,54 +29452,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Свойства магазина алкогольной продукции"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Свойства магазина напитков"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Компьютеры"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Свойства компьютерного магазина"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Бытовая электроника"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Свойства магазина бытовой электроники"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Звуковая аппаратура"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Свойства магазина звуковой аппаратуры"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Мебель"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Свойства мебельного магазина"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Садово-огородный магазин"
@@ -29419,9 +29507,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Свойства садово-огородного магазина"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Хозяйственный магазин"
@@ -29429,9 +29517,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Свойства хозяйственного магазина"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Магазин \"Сделай сам\""
@@ -29439,54 +29527,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Свойства магазина \"Сделай сам\""
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Канцтовары"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Свойства магазина канцтоваров"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Парикмахерская"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Свойства парикмахерской"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Обувь"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Свойство обувного магазина"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Игрушки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Свойства магазина игрушек"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Видео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Свойства магазина видео"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Химчистка"
@@ -29494,9 +29582,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Свойства химчистки"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Прачечная"
@@ -29504,9 +29592,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Свойства прачечной"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Товары для активного отдыха"
@@ -29514,24 +29602,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Свойства магазина товаров для активного отдыха"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Свойства спортивного магазина"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Оптика"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Свойства магазина оптики"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Торговый автомат"
@@ -29539,5 +29627,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Свойства торгового автомата"
@@ -29545,97 +29633,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Реализуемая продукция"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "билеты на общественный транспорт"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "схемы общественного транспорта"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "талоны на парковку"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "продукты питания"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "сладости"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "сигареты"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "еда для животных"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "газеты"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "игрушки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-карты"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "телефонные карты"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "ваучеры"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr "велосипедная шина"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "презервативы"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "тампоны"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "пакеты для экскрементов"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "накопительные, дисконтные карты"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Финансы"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Банк"
@@ -29643,14 +29731,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Свойства банка"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Обмен валют"
@@ -29658,5 +29746,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Свойства пункта обмена валют"
@@ -29664,15 +29752,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Свойства банкомата"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Здравоохранение"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Врач"
@@ -29680,18 +29768,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Свойства врача"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Стоматология"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Свойства стоматологии"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -29699,5 +29787,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Свойства аптеки"
@@ -29705,9 +29793,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Отпуск лекарств по рецептам"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Больница"
@@ -29715,10 +29803,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Свойства больницы"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Пункт экстренного вызова"
@@ -29727,5 +29815,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Свойства пункта скорой помощи"
@@ -29734,20 +29822,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Номер пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Название точки"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Номер телефона"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Используйте международный код, например: +7-916-0857403)"
@@ -29755,5 +29843,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Ветеринария"
@@ -29762,64 +29850,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Свойства ветеринарии"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "География"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Места"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Свойства континента"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Страна"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Свойства страны"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Штат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Свойства штата"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Область"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Свойства области"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Округ"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Свойства округа"
@@ -29827,15 +29915,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Город (более 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Свойства большого города"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Город (до 100 000)"
@@ -29843,10 +29931,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Свойствао малого города / посёлка"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Пригород"
@@ -29854,25 +29942,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Свойства пригорода"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Свойства села"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Деревня"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Свойства деревни"
@@ -29880,5 +29968,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Местность"
@@ -29886,10 +29974,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Свойства местности"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Остров"
@@ -29897,10 +29985,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Свойства острова"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Островок"
@@ -29908,5 +29996,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Свойства островка"
@@ -29914,5 +30002,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Вход в пещеру"
@@ -29920,10 +30008,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Свойства входа в пещеру"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Вершина"
@@ -29931,10 +30019,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Свойства вершины"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Ледник"
@@ -29942,10 +30030,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Свойства ледника"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Вулкан"
@@ -29953,70 +30041,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Свойства вулкана"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Границы"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Государственная"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Свойства государственной границы"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Административная"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Свойства административной границы"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Гражданская"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Свойства политико-административной границы"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Политическая"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Свойства политической границы"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Национальный парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Свойства национального парка"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Землепользование"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Дерево"
@@ -30025,15 +30113,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Свойства дерева"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Научное название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Лес"
@@ -30042,5 +30130,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Свойства леса"
@@ -30048,17 +30136,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "Хвойный"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "Лиственный"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "Смешанный"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Лесопосадки"
@@ -30067,14 +30155,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Свойства лесопосадок"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Заповедник"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Свойства заповедника"
@@ -30082,25 +30170,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Каменистая осыпь"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Свойства каменистой осыпи"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Заросли кустарника"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Свойства зарослей кустарника"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Каменистая пустошь"
@@ -30108,10 +30196,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Свойства каменистой пустоши"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Пустырь"
@@ -30119,5 +30207,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Свойства пустыря"
@@ -30125,5 +30213,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Двор фермы"
@@ -30132,45 +30220,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Свойства двора фермы"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Сельскохозяйственные угодья"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Свойства сельскохозяйственных угодий"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Сенокосный луг"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Свойства сенокосного луга"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Виноградники"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Свойства виноградников"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Огородные участки"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Свойства огородных участков"
@@ -30178,25 +30266,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Сады"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Свойства садов"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Газон"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Свойства газона"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Площадка для праздников"
@@ -30204,10 +30292,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Свойства площадки для праздников"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Общественные земли"
@@ -30215,20 +30303,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Свойства общественных земель"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Свойства парка"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Игровая площадка"
@@ -30236,5 +30324,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Свойства игровой площадки"
@@ -30242,15 +30330,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Жилая зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Свойства жилой зоны"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Погост"
@@ -30258,9 +30346,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Свойства погоста"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Кладбище"
@@ -30268,39 +30356,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Свойства кладбища"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Розничная торговля"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Свойства зоны розничной торговли"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Деловая территория"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Свойства деловой территории"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Промышленная территория"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Свойства промышленной территории"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Территория железной дороги"
@@ -30308,15 +30396,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Свойства территории железной дороги"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Военная зона"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Свойства военной зоны"
@@ -30324,50 +30412,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Строительная площадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Свойства стройплощадки"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Расчистка застройки"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Свойства расчистки застройки"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Зона под застройку"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Свойства зоны под застройку"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Свалка"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Свойства свалки"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Карьер"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Свойства карьера"
@@ -30377,5 +30465,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Править мультиполигон"
@@ -30387,5 +30475,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "внешний сегмент"
@@ -30393,5 +30481,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "внутренний сегмент"
@@ -30399,5 +30487,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr "Граница"
@@ -30408,5 +30496,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr "Свойства границы"
@@ -30414,36 +30502,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr "Тип границы"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr "административная"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr "национальная"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr "общины"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr "политическая"
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr "Административный уровень"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr "Подчиненная территория"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr "Административный центр"
@@ -30451,5 +30539,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Ограничение на поворот"
@@ -30458,5 +30546,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Свойства ограничения на поворот"
@@ -30464,34 +30552,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Ограничение"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "поворот налево запрещён"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "поворот направо запрещён"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "движение прямо запрещено"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "разворот запрещён"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "только направо"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "только налево"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "только прямо"
@@ -30500,15 +30588,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "с линии"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "через точку или линию"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "на линию"
@@ -30516,5 +30604,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Маршрут"
@@ -30523,5 +30611,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Свойства маршрута"
@@ -30529,5 +30617,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Тип маршрута"
@@ -30635,5 +30723,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30644,17 +30732,17 @@
 msgstr "велосипедный"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "автобусный"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "трасса"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "паромный"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "лыжный"
@@ -30722,5 +30810,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30730,9 +30818,9 @@
 msgstr "пеший"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "трамвайный"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "объездной"
@@ -30746,10 +30834,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "линия метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Описание знака"
@@ -30757,31 +30845,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Сеть"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Состояние маршрута"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "планируемый"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "альтернативный"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "временный"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "соединяющий"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Цвет (hex)"
@@ -30790,30 +30878,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "сегмент маршрута"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "сегмент вперёд"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "конечная точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "конечная вперёд"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "конечная назад"
@@ -31040,5 +31128,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "устаревший"
@@ -31691,4 +31779,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -31792,11 +31888,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "искусственный"
@@ -32309,5 +32405,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "пирс"
@@ -32321,5 +32417,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "трубопровод"
@@ -32463,13 +32559,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "развлечения"
@@ -32483,5 +32579,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "гавань"
@@ -32577,10 +32673,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "инфраструктура"
@@ -32682,10 +32778,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "режим_работы"
@@ -33123,24 +33219,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "инфраструктура_светлый"
@@ -33172,6 +33268,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "светлая_вода"
@@ -33232,8 +33328,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "здоровье"
@@ -33586,26 +33682,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "магазин"
@@ -33677,8 +33773,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "отель"
@@ -33779,9 +33875,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "туристический"
@@ -33869,9 +33965,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "исторический"
@@ -33884,5 +33980,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "карьер"
@@ -33896,5 +33992,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "мусорная свалка"
@@ -33916,5 +34012,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "водоём"
@@ -33928,5 +34024,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "двор фермы"
@@ -33949,5 +34045,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "розничная продажа"
@@ -33961,5 +34057,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "промышленный"
@@ -33973,5 +34069,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "заброшенная застройка"
@@ -33985,5 +34081,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "участок для застройки"
@@ -33997,5 +34093,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "жд разъезд"
@@ -34052,7 +34148,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "военный"
@@ -34066,5 +34162,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "кладбище"
@@ -34077,5 +34173,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "пик"
@@ -34090,5 +34186,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "ледник"
@@ -34102,5 +34198,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "вулкан"
@@ -34155,8 +34251,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "природный"
@@ -34170,5 +34266,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "кустарник"
@@ -34182,5 +34278,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "пустошь"
@@ -34194,5 +34290,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "лес"
@@ -34206,5 +34302,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "грязь"
@@ -34218,5 +34314,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "пляж"
@@ -34294,8 +34390,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "маршрут"
@@ -34384,12 +34480,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "граница"
@@ -34539,11 +34635,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "место"
@@ -34557,5 +34653,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "данные TIGER"
@@ -34912,9 +35008,20 @@
 msgstr "Sicily - Италия"
 
-#~ msgid "closedway"
-#~ msgstr "замкнутая линия"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "Полученный тип {0} с id {1} имеет неправильную версию"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Выделенная линия не содержит все выделенные точки"
+#~ msgstr[1] "Выбранная линия не содержит выбранных точек"
+#~ msgstr[2] "Выделенная линия не содержит все выбранные точки"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Градусы, минуты, секунды"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Введите комментарий для загрузки на сервер (мин. 3 символа)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Пожалуйста, введите комментарий для этой загрузки на сервер пакета правок "
+#~ "(мин. 3 символа)"
 
 #~ msgid "No data imported."
@@ -35152,7 +35259,4 @@
 #~ msgstr "Все изображения"
 
-#~ msgid "Boat"
-#~ msgstr "Лодка"
-
 #~ msgid "Motorboat"
 #~ msgstr "Моторная лодка"
@@ -35234,7 +35338,4 @@
 #~ msgid "Contact {0}..."
 #~ msgstr "Связаться с {0}..."
-
-#~ msgid "resolved version:"
-#~ msgstr "Разрешённая версия:"
 
 #~ msgid "Plugin requires JOSM update: {0}."
@@ -36444,4 +36545,7 @@
 #~ msgstr "Дорога для верховой езды"
 
+#~ msgid "closedway"
+#~ msgstr "замкнутая линия"
+
 #~ msgid "MIddle way: {0}"
 #~ msgstr "Середина линии: {0}"
@@ -37180,4 +37284,7 @@
 #~ msgstr " Видео"
 
+#~ msgid "Target of type {0} with id {1} has invalid version"
+#~ msgstr "Полученный тип {0} с id {1} имеет неправильную версию"
+
 #~ msgid "Create house number and street name relation"
 #~ msgstr "Создать отношение для связи номера домов с улицей"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 22568)
+++ applications/editors/josm/i18n/po/sk.po	(revision 22569)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
 "PO-Revision-Date: 2010-06-23 22:48+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-07-28 09:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 17:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -232,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -246,5 +245,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -264,11 +263,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -276,20 +276,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -322,5 +322,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Zlúčiť"
@@ -390,5 +390,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -402,5 +402,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -422,4 +422,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -436,6 +437,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -447,5 +448,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -580,22 +581,22 @@
 msgstr "Sťahujem otvorené súbory zmien"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Spojiť cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Spojiť niekoľko ciet do jednej."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Zmeniť smer?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Otočiť a Spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -605,5 +606,5 @@
 "ciest?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -611,10 +612,10 @@
 msgstr "Nemôžem spojiť cesty (Nemôžu byť spojené do jedného reťazca bodov)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Spojiť {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Prosím, vyberte aspoň dve cesty pre spojenie."
@@ -661,10 +662,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -802,5 +803,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -866,10 +867,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Exportovať do GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Exportovať dáta do GPX súboru."
@@ -1062,5 +1063,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1498,20 +1499,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1535,5 +1536,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1544,6 +1545,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Chyba"
@@ -1570,5 +1571,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1576,5 +1577,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Uložiť aktuálne dáta."
@@ -1631,10 +1632,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Uložiť aktuálne údaje do nového súboru."
@@ -1681,5 +1682,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1706,5 +1707,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Nie, zrušiť"
@@ -1775,18 +1776,24 @@
 msgstr[2] "Zjednodušenie cesty (odstránenie {0} bodov)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Rozdeliť cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Rozdeliť cestu vo zvolenom bode"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Tento výber nemôže byť použitý k rozdeleniu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Zvolené body nezdieľajú rovnakú cestu."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1795,5 +1802,5 @@
 msgstr[2] "Vybraté body nie sú v strede cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1812,21 +1819,10 @@
 "vyberte tiež cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Zvolené body nezdieľajú rovnakú cestu."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Označená cesta neobsahuje vybratý bod."
-msgstr[1] "Označená cesta neobsahuje všetky vybraté body."
-msgstr[2] "Označená cesta neobsahuje všetky vybraté body."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Musíte zvoliť minimálne dva body pre rozdelenie uzavretej cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1836,5 +1832,5 @@
 "cesty.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1845,5 +1841,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1853,5 +1849,5 @@
 "toto overiť a  opraviť ak je to nutné.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2004,5 +2000,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3034,22 +3030,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3195,26 +3191,26 @@
 msgstr "nemôžem vyriešiť nerozhodnutý konflikt"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 "Prázdna množina objektov, na zmazanie je potrebné vybrať aspoň jeden objekt"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Vymazať bod {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Vymazať cestu {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Vymazať reláciu {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3224,5 +3220,5 @@
 msgstr[2] "Zmazať {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3232,5 +3228,5 @@
 msgstr[2] "Zmazať {0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3240,5 +3236,5 @@
 msgstr[2] "Zmazať {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3248,5 +3244,5 @@
 msgstr[2] "Zmazať {0} relácií"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3407,5 +3403,5 @@
 msgstr "Použiť?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3480,17 +3476,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Chyba pri získavaní súború z adresára {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Zmazať staršie súbory pluginov {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Chyba pri vytváraní cache adresára: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3686,42 +3682,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Stupne minúty sekundy"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Očakávané súradnice"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "J"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "S"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "Z"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3729,5 +3728,5 @@
 msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3908,5 +3907,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "pozadie"
@@ -4052,5 +4051,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Znovu nezobrazovať (možnosť pripomenutia)"
@@ -4078,5 +4077,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "železnica"
@@ -4098,6 +4097,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4167,5 +4166,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "budova"
@@ -4253,5 +4252,5 @@
 msgstr "Objekt je vymazaný"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4354,70 +4353,70 @@
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "použitie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Zobrazí túto nápovedu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Štandardný unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Stiahnuť ohraničujúcí box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stiahnite polohu na url (s šírka=x&dĺžka=y&zväčšenie=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Otvoriť súbor (niektoré typy súborov môžu byť otvorené s Súbor/Otvoriť)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Stiahnuť ohraničenú oblasť ako \"raw\" GPS dáta"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Sťahovanie polohy na url (so lat=x&lon=y&zoom=z) ako raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Výber s určeným hľadaním"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Spustiť v maximalizovanom režime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Nastaviť východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Nastaviť jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "možnosti poskytnutia ako Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/JOSM/ZLOŽKE/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Zmena adresára  pre všetký nastavenia užívateľa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4431,9 +4430,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "príklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4443,46 +4442,45 @@
 "poriadku."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Uistite sa, že ste načítali nejaké dáta ak ste použili --výber."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Prebieha inicializácia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Aktualizujem pluginy..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Inštalujem aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Načítavam skoršie pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Nastavujem východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Vytváram hlavné grafické rozhranie ( GUI )"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Načítavam pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Vyriešiť"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4491,5 +4489,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4585,33 +4583,33 @@
 msgstr "Oddialiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "mierka"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Zemepisná dĺžka na mieste kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Meno objektu na mieste kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Zemepisná šírka na mieste kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Uhol medzi predchádzajúcim a súčasným úsekom cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Bude zobrazená smerová šípka v segmente línie."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Dĺžka nového nakresleného segmentu trasy bude zobrazená."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4621,9 +4619,9 @@
 "výber priamo z tohoto zoznamu s myšou.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(žiadny objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4639,4 +4637,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Vrstva ''{0}'' musí byť v  zozname vrstiev"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Číselný"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "čínska"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Obchodná (komerčná)"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5391,5 +5404,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "všetky"
@@ -5473,6 +5486,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5484,5 +5497,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5633,5 +5646,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Súbory zmien"
@@ -5692,5 +5705,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5860,5 +5873,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5866,5 +5879,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5872,5 +5885,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5878,5 +5891,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5884,5 +5897,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5891,5 +5904,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5897,5 +5910,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5903,5 +5916,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5909,24 +5922,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Aktívny filter</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> skryté objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> vypnuté objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -6007,51 +6020,51 @@
 msgstr "Zatvorte dialóg, nevytvorte nový bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Otvoriť zoznam všetkých nahratých vrstiev."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Zmazať vybrané vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Prepnúť viditeľnosť zvolenej vrstvy."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Zobraziť/Skryť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Prepnúť viditeľnosť zvolenej vrstvy."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Aktivovať"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Aktivovať vybratú vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Spojiť túto vrstvu do ďalšej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Duplikovať túto vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Presunúť zvolenú vrstvu o riadok hore."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Presunúť zvolenú vrstvu o riadok dole."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Informácie o vrstve"
@@ -6061,5 +6074,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relácie"
@@ -7232,6 +7245,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7279,107 +7293,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Názov"
@@ -7759,5 +7773,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7848,5 +7862,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<rôzne>"
@@ -8621,5 +8635,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Hranice"
@@ -8692,8 +8706,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Typ"
@@ -8722,6 +8736,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "neznámy"
@@ -9074,5 +9088,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Objavené konflikty"
@@ -9144,14 +9158,15 @@
 "Varovanie: chybná hlavička \"{0}\" nenastala žiadna zhoda s očakávaným vzorom"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Doplniť krátky komentár k nahrávaným zmenám"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Doplnte nejaký komentár pre nahrávanie (min. 3 znaky)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Neplatná poznámka nahrávania"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "Zmenový súbor id:"
@@ -9633,5 +9648,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Nahrať"
@@ -9653,5 +9668,5 @@
 msgstr "Inicializujem relácie na aktualizáciu ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9659,61 +9674,95 @@
 msgstr "Nastavenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "Rozhodnite sa ako nahrať dáta a ktoré zmenové dáta použiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Značky pre nový súbor zmien"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Použité značky pre dáta zmenovúho súboru sú nahraté do"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 "Otvorte správu zmenových súborov a vyberte zmenový súbor na nahratie do"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Nastavenie pokročilých nastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Nahrať do ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Nahrať zmeny"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Nahrať zmenené pôvodné"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Neplatná poznámka nahrávania"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Obrátene"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Pokračovanie"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Zrušiť a návrat do editora"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Nezobrazovať v budúcnosti"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Prosím najskôr vložte platnú veľkosť"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Nedovolená veľkosť"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Zrušiť nahrávanie a pokračovať v editácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -10089,107 +10138,11 @@
 msgstr[2] "{0} zmazaných objektov:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "gps poloha bodu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Prispôsobiť kresliacu trasu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Použíť globálne nastavenie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Výber nastavenia kreslenej čiary"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Prispôsobiť farbu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predvolené"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Zvoľte farbu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Značky z pomenovaných bodov"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Pomenovanie trackpoints od {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Importovať zvuk"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože body "
-"cesty neobsahujú časovú značku nemôžme ich zladiť s audio dátami.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Import nie je možný"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audiosúbory (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Zukové značky z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importovať obrázky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože body "
-"cesty neobsahujú časovú značku nemôžme ich zladiť s obrázkami.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10197,5 +10150,5 @@
 msgstr "Meno: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10203,5 +10156,5 @@
 msgstr "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10212,23 +10165,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Popis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Časový interval"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Dĺžka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10238,5 +10191,5 @@
 msgstr[2] "{0} trás, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10246,10 +10199,10 @@
 msgstr[2] "{0} waypointov (bodov cesty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Konvertovať do dátovej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10259,21 +10212,21 @@
 "chcete nahrať stopy (traces), pozrite sem:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Prevedené z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10281,10 +10234,10 @@
 msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Stiahnuť všetko vo vnútry:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10292,10 +10245,10 @@
 msgstr "{0} metrov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Maximálna plocha na požiadavku:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10303,21 +10256,21 @@
 msgstr "{0} štvorcových km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr "Stiahnuť okolo:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr "iba stopy(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr "iba waypointy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr "stopy a waypointy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10329,9 +10282,9 @@
 "<br>Chcete pokračovať?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10341,5 +10294,5 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10349,23 +10302,119 @@
 "ich času boli vynechané."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Prispôsobiť kresliacu trasu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Použíť globálne nastavenie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Výber nastavenia kreslenej čiary"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Prispôsobiť farbu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predvolené"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Zvoľte farbu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Značky z pomenovaných bodov"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Pomenovanie trackpoints od {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Importovať zvuk"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože body "
+"cesty neobsahujú časovú značku nemôžme ich zladiť s audio dátami.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Import nie je možný"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audiosúbory (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Zukové značky z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importovať obrázky"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>Údaje v GPX vrstve ''{0}'' boli stiahnuté zo servera.<br>Pretože body "
+"cesty neobsahujú časovú značku nemôžme ich zladiť s obrázkami.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Údajová vrstva {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "mimo ukladanej oblasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "verzia {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10375,11 +10424,11 @@
 msgstr[2] "Bolo tam zistených {0} konfliktov."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Kliknutím zavriete tento dialóga pokračujete v editovaní"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10389,36 +10438,36 @@
 msgstr[2] "{0} vymazaných"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skladá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "neuršený (unset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "Verzia API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Previesť do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Test konzistencie dátovej sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "Nezistený žiadny problém"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Bol najdený nasledujúci problém:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10428,5 +10477,5 @@
 "závadné.<br>Ak chcete nahrať stopy, pozrite sem:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10436,5 +10485,5 @@
 msgstr[2] "stopy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10443,5 +10492,5 @@
 msgstr[2] "bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10451,5 +10500,5 @@
 msgstr[2] "stopy s {0} bodmi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10459,5 +10508,5 @@
 msgstr[2] "{0} skladá sa z {1} stôp"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10467,24 +10516,28 @@
 msgstr[2] "{0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Zladiť GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Súbory GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Súbor {0} je ešte nahratý pod menom \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Chyba pri rozkladaní {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nemôžem čítať \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10496,34 +10549,34 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Čas fotografie (z exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "GPS čas (čítaj nad fotografiou) "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Som v časovej zóne: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Žiaden dátum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Otvoriť inú fotografiu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchronizovať čas z fotky a GPS prímača"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10533,21 +10586,21 @@
 "Prosím použite požadovaný formát."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Neplatný dátum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Nie je zatiaľ nahratá GPX stopa (track)>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX stopa(trasa): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Otvoriť inú GPX stopu(trasu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10556,72 +10609,72 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Auto-Guess"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr "Spárovať prvú fotografiu s prvým bodom GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Manuálne nastavenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "Prednastaviť pozíciu pre: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Obrázky so zemepisnou polohou v exif dátach ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Obrázky, ktoré sú už označkované ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Zobraziť miniatúry obrázkov na mape"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Časové pásmo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Vyrovnať(Offset):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Zladiť obrázky s GPX stopou(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Zladiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Neplatné časové pásmo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Neplatné vyrovnanie (offset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Skúsiť znovu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "Žiadne obrázky nemôžu byť vyrovnané!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "Žiadny gpx nie je vybratý"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10635,20 +10688,20 @@
 "<html>Vyrovnané <b>{0}</b> z <b>{1}</b> fotografie do GPX stopy.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Časové pásmo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minút: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekúnd: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10658,5 +10711,5 @@
 msgstr[2] "Časová odchýlka z {0} dní"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10666,21 +10719,21 @@
 "posúvač ručne na fotky."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Priraďovanie fotiek ku stope(track) zlyhalo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Nastaviť časové pásmo a vyváženie(offset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "Vybraté fotografie neobsahujú informácie o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Fotografie neobsahujú informácie o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10688,17 +10741,17 @@
 msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX Stopa nemá informáciu o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Môžete vybrať GPX stopu(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Nevybratá GPX stopa(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10709,5 +10762,5 @@
 "Čakám na formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10718,56 +10771,52 @@
 "Čakám na formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Získavam GPS polohu z EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Začínam prehľadávať adresár"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "Niektorý z vybratých súborov bol prázdny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Čítať fotky..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Čítam {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Nemôžem získať cestu pre adresár {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prehľadávam adresár {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Nájdený prázdny súbor v adresári {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Chyba pri získavaní súború z adresára {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS súradnicami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Zladiť GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10777,5 +10826,5 @@
 msgstr[2] "{0} načítaných obrázkov."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10785,10 +10834,10 @@
 msgstr[2] "{0} boli založené GPS značky."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Vymazať súbor s obrázkom z disku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10799,5 +10848,5 @@
 "stratený!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "Súbor s obrázkom nemôže byť zmazaný."
@@ -10899,9 +10948,9 @@
 msgstr "JPEG obrázky (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps značka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10910,5 +10959,5 @@
 msgstr[2] "značiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10918,9 +10967,23 @@
 msgstr[2] "{0} pozostáva z {1} značiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"Neexistujú zvukové značky v tejto vrstve, voči ktorým by bolo možné nastaviť "
+"posunutie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "Zobraziť Text / Ikony"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Prepínač zobrazovania značiek textu a ikon."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Synchronizovať audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10929,5 +10992,5 @@
 "synchronizácie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10935,14 +10998,14 @@
 msgstr "Zvuk zosynchronizovaný na bode {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Nie je možné synchronizovať v už prehrávanej vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Vytvoriť Zvukovú značku v \"Play Head\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10950,18 +11013,4 @@
 msgstr ""
 "Potrebujete pozastaviť(pause) audio v bode na stope, kde chcete mať znažku."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"Neexistujú zvukové značky v tejto vrstve, voči ktorým by bolo možné nastaviť "
-"posunutie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr "Zobraziť Text / Ikony"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Prepínač zobrazovania značiek textu a ikon."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11912,4 +11961,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Žiadny"
@@ -11924,5 +11974,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "Kresliť kruh z HDOP hodnoty."
@@ -12025,5 +12075,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Iba dôležité smery (napr. jednosmerka)"
@@ -12031,5 +12081,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Iba na začiatku cesty."
@@ -12059,5 +12109,20 @@
 msgstr "Vytvorenie markerov pri čítaní GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Autor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Nafta"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Loď"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12066,9 +12131,9 @@
 "Automatické vytvorenie vrstvy značiek z bodov cesty pri otvorení GPX vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Kresliť čiary medzi raw GPS bodmi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12078,9 +12143,9 @@
 "1'' pre kresbu všetkých čiar."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Maximálna dĺžka pre lokálne súbory (v metroch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12089,10 +12154,10 @@
 "kreslenie všetkých línií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Maximálna dĺžka (metrov)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12101,10 +12166,10 @@
 "čiarach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Kresliť smerové šípky pre línie, ktoré spájajú GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12113,5 +12178,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12119,13 +12184,13 @@
 msgstr "Nekreslite šípky ak sa nezmestí do tohoto rozmedzia."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Minimálna vzdialenosť (pixelov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovať väčšie bodky pre GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12135,9 +12200,9 @@
 "v  manažéri vrstiev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Farby bodov traťových segmentov podľa rýchlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12147,5 +12212,5 @@
 "pre digitalizáciu musia zaznamenať informácie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12153,23 +12218,32 @@
 "rýchlostí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Farebná trať a body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "Popis bodov"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Kresliť smer cestného segmentu"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Kresliť poradové čísla všetkých segmentov v rámci cesty."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -12177,19 +12251,19 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovať hranice dát stiahnutých zo servera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovať neaktívne vrstvy dát inou farbou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM údaje"
@@ -12573,21 +12647,26 @@
 msgstr "Niektoré nastavenia sa prejavia až po reštartovaní JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Metóda projekcie"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Kód projekcie"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Zobrazovať súradnice ako"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Metóda projekcie"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Kód projekcie"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Vrstva pre vykonávanie meraní"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Projekcia mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -13179,5 +13258,5 @@
 msgstr "Pridať novú značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -13188,49 +13267,49 @@
 "byť rovnaký ako v hodnotách"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Viac informácii o tejto vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "Dostupné úlohy"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr "úlohy"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr "počet"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr "prvky"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Voliteľné atribúty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznány type (druh): {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13240,15 +13319,15 @@
 msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba rozkladania(parsovania) {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementy typu(druhu) {0} sú podporované."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13259,17 +13338,17 @@
 msgstr[2] "Zmeniť {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Nič nie je vybraté!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Nevhodný výber!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Použiť predvolené"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13287,7 +13366,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Hľadať: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -13296,17 +13374,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Vyhľadávanie pre objekty"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Ukáž lokalizovaný názov vo vybratom zozname"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Hľadať: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13627,5 +13702,5 @@
 msgstr "Rozloženie súboru \"{0}\" neúspešné"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu"
@@ -15243,5 +15318,5 @@
 "<br><br>Chybová správa je:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15535,5 +15610,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Interpolácia adries"
@@ -15876,41 +15951,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "Stavebné riešenie(Building address)"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "Číslo domu"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Názov ulice"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Prírastok"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Úbytok"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Počet: (Numbers:)"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15927,25 +16002,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Nastaviť veľkosť budovy"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "Použiť adresný dialóg"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Šírka budovy:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr "Dĺžka kroku:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15983,18 +16058,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Budovy, stavby"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Ulica"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -16172,7 +16247,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
-#, fuzzy
 msgid "Use \"Tableau d''assemblage\""
-msgstr "Vybrať Tableau d'Assemblage"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -16236,8 +16310,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "voda"
@@ -16298,6 +16372,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "adresa"
@@ -16801,34 +16875,34 @@
 "Najskôr vyberte jednu z nich a potom zopakujte"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Prázdna vrstva"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS vrstva ({0}), {1} dlaždice(dlaždíc) načítané"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Nie je vektorizované."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Veľkosť rastra: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "Je vektorizované."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Hranice obce bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16839,9 +16913,9 @@
 "Vytvorte nový súbor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Cache chýb formátov"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -16850,5 +16924,5 @@
 "Lambertova zónou {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 msgid "Cache Lambert Zone Error"
 msgstr "Cache chýb v Lambert Zóne"
@@ -16927,22 +17001,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Sťahujem objekt..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Sťahovanie údajov mapy na konci vybratej cesty"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Stiahnuť teraz"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Prosím zvolte aspoň jednu úlohu k stiahnutiu"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16952,12 +17022,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Overovanie {0}/{1}: Súšťa sa {2}"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Chyba parsovania{0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16988,9 +17058,9 @@
 msgstr "Vytvoriť duplikát cesty"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Vrstva na úoravu GPX stôp(tracks)"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konvertovať do GPX vrstvy s neznámym časom"
@@ -17000,5 +17070,5 @@
 msgstr "UpraviťGpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "upraviť gpx stopy(tracks)"
@@ -17007,11 +17077,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Importovať cestu z GPX vrstvy"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Zahodiť existujúcu cestu"
@@ -17021,5 +17091,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "GPS dátová vrstva nie je vytvorená."
@@ -17029,13 +17099,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -17277,5 +17347,5 @@
 msgstr "Zobraziť fotky bez informácií o polohe"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Importované obrázky"
@@ -17636,8 +17706,6 @@
 msgstr "Otvoriť okno merania."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Vynulovať (Reset)"
@@ -17668,5 +17736,5 @@
 msgstr "Úhol medzi dvoma zvolenými bodmi"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Vrstva pre vykonávanie meraní"
@@ -17759,5 +17827,5 @@
 msgstr "OpenStreetBugs sťahovaná slučka"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Zobrazuje chyby z OpenStreetBugs"
@@ -17829,13 +17897,13 @@
 msgstr "Poradie"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "odpojený"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "pripojený"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17950,94 +18018,94 @@
 msgstr "Spúšťací súbor Firefoxu"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "Chyba čítania!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "Chyba zapisovania!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "Zapíšte súradnice do hlavičky obrázka"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr "Napíšte informáciu o polohe do hlavičky Exif nasledujúcich súborov:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "nastavenia"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "uchovávať záložné súbory"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "čas poslednej zmeny súboru:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "podľa času GPS"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "na predchádzajúce hodnoty (nezmenený mčas)"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr "Photo Geotagging Plugin"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "Písanie informácií o polohe do súborov obrázkov ..."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "Nemôžem čítať mčas."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "Nemôžem zapisovať mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "Súbor nemohol byť zmazaný!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "Nebolo možné premenovať súbor!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr "<html><h3>Existujú staré zálohy súborov v adresári obrázkov!</h3>"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "Prepísať staré záložné súbory?"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "Ponechať staré zálohy a pokračovať"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "Nahradiť"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "Nemôžem zmazať dočasný súbor!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "Test zlyhal: Nemôžem čítať mčas."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "Test zlyhal: Nemôžem zapísať mčas."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "Zapíšte súradnice do hlavičky obrázka"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -18078,9 +18146,9 @@
 msgstr "Nová obrázková vrstva zo súboru ..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "Obrázok nie je správne vytvorený."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "Nepodarilo sa nájsť objekt na mape."
@@ -18258,20 +18326,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "finálna verzia:"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "potvrdzovať všetky požiadavky Vzdialenej kontroly ručne"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Plugin umožňujúci ovládanie JOSM z iných aplikácií."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Vzdialené ovládanie"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Nastavenie pre plugin \"Remote Control\" Vzdialené ovládanie."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18283,50 +18356,58 @@
 "využívajúce tento plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Povolené činnosti"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Vzdialená kontrola požiadala o načítanie dát z API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaily požiadavky: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Chcete toto povoliť?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Potvrdiť činnosť vzdialenej kontroly"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr "Vzdialená Správa s spýtala na vytvorenie nového bodu."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Vzdialená kontrola požiadala o import dát z nasledujúcej URL:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -18334,5 +18415,5 @@
 msgstr "Vrátiť zmeny vykonané v zmenovom súbore"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Vrátiť naspäť"
@@ -18531,41 +18612,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Nahrať Dlaždice (Tiles)"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "Ukázať Info Dlaždíc"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Nahrať Všetky Dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Priblíženie"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Oddialiť"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "Snímka na veľkosť dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "obrázok "
@@ -18870,4 +18951,14 @@
 msgid "Terrace"
 msgstr "Rad (Terrace)"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Oddeľovač"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19631,6 +19722,6 @@
 msgstr "Pridať chýbajúcu značku {0}={1}"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19643,9 +19734,9 @@
 "napája na cestu <span class=\"object-name\">{3}</span>."
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr "Teraz rozdeliť"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr "Rozdeliť cestu"
@@ -19728,6 +19819,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19735,5 +19826,5 @@
 msgstr "Overovanie chýb"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Žiadne chyby na overenie"
@@ -19979,32 +20070,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Zlúčiť duplikátne body?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Duplicitné body"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Duplicitné body"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Zlúčiť duplikátne body?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Duplicitné body"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Zlúčiť duplikátne body?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -20043,5 +20128,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "multipolygón"
@@ -20572,5 +20657,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "oblasť (plocha)"
@@ -20707,10 +20792,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -20858,10 +20943,10 @@
 msgstr "Nemôžem čítať informácie z walking-papers.org the id \"{0}\""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -21065,9 +21150,5 @@
 "Môže to viesť k zlým súradniciam."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automatické sťahovanie"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21075,19 +21156,19 @@
 "Varovanie: WMS vrstva je deaktivovaná, pretože je obsahuje chybnú url ''{0}''"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(deaktivované)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, 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:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -21102,17 +21183,17 @@
 "<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Áno, stiahni obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "Chybná URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Stiahnuť viditeľné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21120,48 +21201,52 @@
 "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Zmena rozlíšenia"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Nahrať poškodené dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Uložiť WMS vrstvu do súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Uložiť WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Nahrať WMS vrstvu zo súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Načítať WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Chyba formátu súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Chyba pri nahrávaní súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Nastaviť WMS Záložku"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automatické sťahovanie"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -21240,5 +21325,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -21276,5 +21361,5 @@
 msgstr "Audio zariadenie nedostupné"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -21295,5 +21380,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "les"
@@ -21306,78 +21391,67 @@
 #. relation type
 #: build/specialmessages.java:17
-#, fuzzy
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr "vytvoriť pridruženú reláciu"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "hranica (boundary)"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Prírastok"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "vedenie"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "multipolygón"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Sieť"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "hromadná doprava"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Obmedzenie"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "trasa (route)"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "miesto (blízke okolie)"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "vodný tok"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -21658,7 +21732,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -21884,6 +21957,11 @@
 msgstr "Vytvára radové domy mimo jednotlivých blokov."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21892,5 +21970,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21901,5 +21979,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21908,10 +21986,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21923,5 +22001,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21931,5 +22009,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21940,5 +22018,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -21946,10 +22024,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 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:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21960,5 +22038,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22093,5 +22171,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Ref. číslo"
@@ -22630,5 +22708,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "kov"
@@ -22641,5 +22719,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "drevo (wood)"
@@ -22943,9 +23021,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "áno"
@@ -23055,9 +23133,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "nie"
@@ -23316,5 +23394,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "obytná (osídlená)"
@@ -23363,5 +23441,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "obslužná (service)"
@@ -23396,5 +23474,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "konštrukcia"
@@ -23481,5 +23559,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "turistika"
@@ -23514,5 +23592,5 @@
 msgstr "dobré"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "stredne pokročilý (intermediate)"
@@ -23682,14 +23760,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operátor"
@@ -23958,6 +24036,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Nadmorská výška"
@@ -24411,5 +24489,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "močiar (marsh)"
@@ -24815,5 +24893,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Napätie"
@@ -25178,31 +25256,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Otváracia doba"
@@ -25262,90 +25340,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pi 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ut-Ne 08:00-15:00; So 08:00-12:00"
@@ -25458,7 +25536,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Referenčné číslo"
@@ -25474,5 +25552,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "podzemie"
@@ -25485,6 +25563,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Poplatok"
@@ -25660,5 +25738,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Invalidný vozík"
@@ -25695,6 +25773,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Prístrešok"
@@ -25702,5 +25780,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Lavička"
@@ -25819,5 +25897,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Signál (rádiomaják)"
@@ -25978,5 +26056,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Kuchyňa"
@@ -25984,73 +26062,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "talianska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "čínska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "grécka"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "nemecká"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "regionálna"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "ázijská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "sendvič"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Rýchle občerstvenie"
@@ -26058,17 +26141,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Upraviť reštauráciu rýchleho občerstvenia"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "kura"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Kaviareň"
@@ -26076,9 +26159,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Upraviť kaviareň"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Krčma"
@@ -26086,18 +26169,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Upraviť krčmu"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Záhradná reštaurácia"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Upraviť záhradnú reštauráciu"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Bar (výčap)"
@@ -26105,9 +26189,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Upraviť bar (výčap)"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Nočný klub"
@@ -26115,24 +26199,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Upraviť nočný klub"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Atrakcia"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Upraviť atrakciu"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Múzeum"
@@ -26140,9 +26224,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Upraviť múzeum"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -26151,9 +26235,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Upraviť zoo"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Výhliadka"
@@ -26161,24 +26245,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Upraviť výhliadku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Výhliadková veža"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Zábavný park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Umelecké dielo"
@@ -26186,5 +26270,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Upraviť umelecké dielo"
@@ -26192,19 +26276,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Informačná kancelária"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Úroveň detailu"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "topografická"
@@ -26242,5 +26326,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26248,28 +26332,28 @@
 msgstr "pouličná sieť"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "prehľadová (oreintačná)"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Zobrazená oblasť"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "miesto (blízke okolie)"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "mesto (city)"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "oblasť (region)"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -26279,5 +26363,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Zobrazené cesty sú pre:"
@@ -26285,5 +26369,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Turistika"
@@ -26291,6 +26375,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -26298,5 +26382,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "Horský bicykel"
@@ -26304,6 +26388,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Lyžovanie"
@@ -26311,5 +26395,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "Jazdectvo"
@@ -26317,46 +26401,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "... iný druh prepravy"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Informačná tabuľa"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Informačný panel s radami (board content)"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "upozornenie"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "príroda"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "divoká príroda"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "závod"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Rázcestník (ukazovateľ smeru)"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "stožiar(pole)"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Informačný terminál"
@@ -26364,29 +26456,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Bližší popis"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Audiosprievodcovia"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Audiosprievodcovia cez mobilný telefón?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Číslo telefónu"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Ostatné (iné) informačné body (miesta)"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Upraviť prístrešok"
@@ -26394,25 +26486,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Ohnisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Výletné miesto"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Upraviť výletné miesto"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Historické miesta"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Hrad"
@@ -26421,19 +26513,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Upraviť hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Zrúcanina"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Upraviť zrúcaninu"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Archeologické nálezisko"
@@ -26442,9 +26534,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Upraviť archeologické nálezisko"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Bojisko"
@@ -26452,10 +26544,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Upraviť bojisko"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Palaeontological Areál"
@@ -26463,5 +26555,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Upraviť Palaeontological Areál"
@@ -26469,15 +26561,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Upraviť pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Pomník"
@@ -26485,55 +26577,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Upraviť pomník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Upraviť kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Božia muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Upraviť božiu muku"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Hraničné kamene"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Upraviť hraničné kamene"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Voľný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Vodný zábavný park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Upraviť vodný zábavný park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Ihrisko"
@@ -26541,35 +26633,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Upraviť ihrisko"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Rybolov"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Upraviť rybolov"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Športy"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Športové zariadenie"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Štadión"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Upraviť štadión"
@@ -26583,6 +26675,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "vyberte šport:"
@@ -26998,31 +27090,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "šport"
@@ -27032,78 +27124,78 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "lukostreľba"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr ""
 "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "kanoe"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "lezenie"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr ""
 "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr ""
@@ -27111,165 +27203,165 @@
 "trávnika)"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "bicyklovanie"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "závody chrtov"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "jazdectvo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "konské dostihy"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "automobilový"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "racquetbal (podobné ako squash, iné pravidlá)"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "streľba"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "korčuľovanie"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "lyžovanie"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "futbal (soccer)"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "plávanie"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "stolný tenis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Športové centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Upraviť športové centrum"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Hracia plocha, ihrisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Upraviť hraciu plochu, ihrisko"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Dostihová dráha"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Upraviť dostihovú dráhu"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golfové ihrisko"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Upraviť golfové ihrisko"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Upraviť minigolf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Upraviť Multi"
@@ -27311,23 +27403,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "typ"
@@ -27369,211 +27461,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "hracia plocha, ihrisko"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "športové centrum"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "štadión"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "stopa"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "10pin (Kolok na hru s desiatimi kolkami)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Upraviť atletiku"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Lukostreľba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Upraviť lukostreľbu"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Lezenie"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Upraviť lezenie"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Upraviť kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Upraviť cyklistiku"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Preteky chrtov"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Upraviť preteky chrtov"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Jazdectvo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Upraviť jazdectvo"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Konské dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Upraviť konské dostihy"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Upraviť turistiku"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Motošport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Upraviť motošport"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Korčuľovanie"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Upraviť korčuľovanie"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Upraviť Skateboard"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Plávanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Upraviť plávanie"
@@ -27581,52 +27673,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Upraviť lyžovanie"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "zjazdárska"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "beh nalyžiach hore kopcom (nordic)"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "park zimných športov"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Obtiažnosť"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "pre začiatočníkov"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "ľahká"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "pokročilý (advanced)"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "pre skúsených"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Streľba"
@@ -27634,204 +27726,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Upraviť streľbu"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Šport (loptový)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Futbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Upraviť futbal"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Upraviť Australian Football"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Bejzbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Upraviť bejzbal"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Upraviť basketbal"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Upraviť golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golfové ihrisko"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Bowling na tráve"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Upraviť bowling na tráve"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Upraviť bowling"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Upraviť kriket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Cvičné ihrisko pre kriket so sieťou"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Upraviť cvičné ihrisko pre kriket so sieťou"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Upraviť kroquet"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Upraviť hokej"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Upraviť polotu"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Racquetbal"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Upraviť racquetbal"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Stolný tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Upraviť stolný tenis"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Upraviť tenis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Človekom-Vytvorené (Man-Made)"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Budova"
@@ -27839,5 +27931,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Verejná budova"
@@ -27845,10 +27937,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Upraviť verejnú budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Radnica (obecný úrad)"
@@ -27856,10 +27948,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Upraviť radnicu (obecný úrad)"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -27867,10 +27959,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Upraviť veľvyslanectvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Súd"
@@ -27879,10 +27971,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Vezenie"
@@ -27891,10 +27983,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Polícia"
@@ -27904,10 +27996,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Upraviť políciu"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Hasičská stanica"
@@ -27916,10 +28008,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Upraviť hasičskú stanicu"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Pošta"
@@ -27927,5 +28019,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Upraviť poštu"
@@ -27933,15 +28025,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Škôlka"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Upraviť škôlku"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Škola"
@@ -27949,10 +28041,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Upraviť školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Univerzita"
@@ -27960,10 +28052,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Upraviť Univerzitu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Vysoká škola"
@@ -27971,5 +28063,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Upraviť vysokú školu"
@@ -27977,5 +28069,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Kino"
@@ -27984,10 +28076,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Upraviť kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Knižnica"
@@ -27996,9 +28088,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Upraviť knižnicu"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Kultúrne stredisko"
@@ -28006,10 +28098,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Upraviť kultúrne stredisko"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Divadlo"
@@ -28018,10 +28110,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Upraviť divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Kostol"
@@ -28031,5 +28123,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Upraviť kostol"
@@ -28038,6 +28130,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Náboženstvo"
@@ -28046,66 +28138,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "baháisti"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "budhisti"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "kresťania"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hinduisti"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "džinisti"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "judaisti"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "moslimovia"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "spiritualisti"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoisti"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "unitársky"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Vyznanie (cirkevné)"
@@ -28114,81 +28206,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglikánska"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptistická"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "katolícka"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evanjelikánska"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "svedkovia jehovovi"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "lutheránska"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "methodistická"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormónska"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "orthodoxná"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbiteriánska"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestanská"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "quakerská"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "šiítska"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunnitská"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Adresy"
@@ -28197,5 +28289,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Upraviť informácie o adrese"
@@ -28203,5 +28295,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Číslo domu"
@@ -28209,25 +28301,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Meno domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Názov ulice"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Názov mesta"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Poštové smerovacie číslo"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Kód krajiny"
@@ -28236,5 +28328,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Upraviť interpoláciu adries"
@@ -28242,61 +28334,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Schéma číslovania"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "nepárne"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "párne"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "abecedný"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Človekom vytvorené (Man made)"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Závody (továrne)"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Upraviť závody (továrne)"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Veža"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Upraviť vežu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Typ veže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "telekomunikačná"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "pozorovateľňa"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Výška (metre)"
@@ -28304,25 +28396,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Upraviť vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Plynojem (Gasometer)"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Upraviť plynojem (gasometer)"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Maják"
@@ -28330,10 +28422,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Upraviť maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Veterný mlyn"
@@ -28341,10 +28433,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Upraviť veterný mlyn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Potrubie"
@@ -28353,41 +28445,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Upraviť potrubie"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "plynová"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "teplo(heat)"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "ropa(oil)"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "splašky(sewage)"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "nejaké látky(any substance)"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "podvodné(underwater)"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "nadzemné(overground)"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Čistička odpadových vôd"
@@ -28397,10 +28489,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Upraviť čističku odpadových vôd"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Žeriav"
@@ -28408,5 +28500,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Upraviť žeriav"
@@ -28414,10 +28506,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Upraviť signál (rádiomaják)"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Meračský bod"
@@ -28425,10 +28517,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Upraviť meračský bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Pozorovanie (ostraha)"
@@ -28436,23 +28528,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Upraviť pozorovaciu kameru"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "vnútorný"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "vonkajší"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "verejný"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Elektráreň (spôsob vyroby)"
@@ -28462,35 +28554,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Upraviť elektráreň (spôsob vyroby)"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "veterná"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "vodná"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fosílna"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "jadrová"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "uhoľná"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "fotovoltanická (slnečná články)"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Transformátorová stanica"
@@ -28499,10 +28591,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Upraviť trafostanicu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Malý transformátor"
@@ -28511,5 +28603,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Upraviť malý transformátor"
@@ -28517,10 +28609,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "Odkazová linka"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Elektrický stožiar (vysoké napätie)"
@@ -28531,23 +28623,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Upraviť elektrický stožiar"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "veža"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "stožiar(pole)"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Nastavenie veže"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Elektrické vedenie"
@@ -28556,78 +28648,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Upraviť elektrické vedenie"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Typ vedenia"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "vedenie"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "vedľajšie_vedenie"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Počet káblov"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Počet vodičov (lepší: vodič) pre napájacie káble"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "jedno"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "dvojité"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "trojité"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "štvorité"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Vybavenosť (Amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Toalety"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "omedzený"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Poštová schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefón"
@@ -28636,5 +28726,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Upraviť telefón"
@@ -28642,5 +28732,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Mince"
@@ -28648,5 +28738,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Bankovky"
@@ -28654,5 +28744,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Platobné karty a Kreditné karty"
@@ -28660,5 +28750,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Debetné karty"
@@ -28666,15 +28756,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Kreditné karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telefónne karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Recyklácia"
@@ -28683,5 +28773,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Upraviť recykláciu (zber)"
@@ -28689,35 +28779,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Batérie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Handry"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Železný šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Odpadkový kôš"
@@ -28725,5 +28815,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Upraviť odpadkový kôš"
@@ -28732,31 +28822,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Oreradlo chrbta (Backrest)"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "kameň"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Farba"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "čierna"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "hnedá"
@@ -28835,39 +28925,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "zelená"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "šedá"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "biela"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Počet sedadiel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Poľovnícky posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Upraviť poľovnícky posed"
@@ -28876,30 +28966,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "nízky"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "polovičný"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "úplný"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Skryť"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Fontána"
@@ -28908,10 +28998,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Upraviť fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -28920,10 +29010,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Upraviť pitnú vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -28932,5 +29022,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Upraviť hydrant"
@@ -28938,5 +29028,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Hniezdo záchrany"
@@ -28944,15 +29034,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Upraviť hniezdo záchrany"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Obchod s autami"
@@ -28960,10 +29050,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Upraviť obchod s autami"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Bicyklový obchod"
@@ -28972,28 +29062,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Upraviť bicyklový obchod"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Upraviť supermarket"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Lekáreň"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Upraviť lekáreň"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Obchod s polotovarmi"
@@ -29001,9 +29091,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Upraviť obchod s polotovarmi"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Stánok"
@@ -29011,27 +29101,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Upraviť stánok"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Kníhkupectvo"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Upraviť kníhkupectvo"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Cestovná kancelária"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Upraviť cestovnú kanceláciu"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Mäsiareň"
@@ -29039,9 +29129,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Upraviť mäsiarstvo"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Chlieb a pečivo"
@@ -29049,9 +29139,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Upraviť chlieb a pečivo"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Kvetinárstvo"
@@ -29059,18 +29149,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Upraviť kvetinárstvo"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Biopotraviny"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Upraviť biopotraviny"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -29078,54 +29168,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Upraviť Obchod s alkoholickými nápojmi"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Upraviť Obchod s nápojmi."
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Počítač"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Upraviť počítačový obchod"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Upraviť obchod s elektronikou"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Upraviť obchod s Hifi elektronikou"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Nábytok"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Upraviť obchod s nábytkom"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Záhradné centrum"
@@ -29133,9 +29223,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Upraviť záhradné centrum"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Železiarstvo"
@@ -29143,9 +29233,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Upraviť železiarstvo"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Obchod Urob si sám"
@@ -29153,54 +29243,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Upraviť obchod Urob si sám"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Papierníctvo"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Upraviť papierníctvo"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Kaderníctvo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Upraviť kaderníctvo"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Obuva"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuvou"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Hračky"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Upraviť obchod s hračkami"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Obchod s DVD"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Upraviť obchod s DVD"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Chemická čistiareň"
@@ -29208,9 +29298,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Upraviť chemickú čistiareň"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Práčovňa"
@@ -29218,9 +29308,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Upraviť práčovňu"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Turistický (Outdoor)"
@@ -29228,24 +29318,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Upraviť športový obchod"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Upraviť očnú optiku"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Predajný automat"
@@ -29253,5 +29343,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Upraviť predajný automat"
@@ -29259,97 +29349,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Predávané výrobky"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "lístky MHD"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "plány MHD"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "parkovacie lístky"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "jedlo"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "pitie"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "fotky"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "krmivo pre zvieratá"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "telefónne kupóny (poukážky)"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "kupóny (poukážky)"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "kondómy"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "Prístupové alebo vernostné karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Hotovosť"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Banka"
@@ -29357,14 +29447,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Upraviť banku"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Zmenáreň"
@@ -29372,5 +29462,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Upraviť zmenáreň"
@@ -29378,15 +29468,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Upraviť bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Zdravie"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Lekári"
@@ -29394,18 +29484,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Upraviť lekárov"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Zubný lekár"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Upraviť zubného lekára"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Lekáreň"
@@ -29413,5 +29503,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Upraviť lekáreň"
@@ -29419,9 +29509,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "výdaj na recepty"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Nemocnica"
@@ -29429,10 +29519,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Upraviť nemocnicu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Pohotovosť (Záchranná služba)"
@@ -29441,5 +29531,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Upraviť pohotovosť (záchrannú službu)"
@@ -29448,20 +29538,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Číslo bodu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Meno bodu(miesta)"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Telefónne číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použite medzinárodný kód, ako +12-345-67890)"
@@ -29469,5 +29559,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Veterinár"
@@ -29476,64 +29566,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Upraviť veterinárnu ambulanciu"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geografia(Zemepis)"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Miesta"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Upraviť kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Krajina (štát)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Upraviť krajinu (štát)"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Stav"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Upraviť štát"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Oblasť (región)"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Upraviť oblasť (región)"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "kraj (okres)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Upraviť kraj (okres)"
@@ -29541,15 +29631,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Mesto (city)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Mesto (town)"
@@ -29557,10 +29647,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Štvrť"
@@ -29568,25 +29658,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Upraviť štvrť"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Dedina"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Upraviť dedinu"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Malá dedina / osada / samota"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Upraviť malú dedinu"
@@ -29594,5 +29684,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Oblasť (lokalita)"
@@ -29600,10 +29690,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Upraviť oblasť (lokalitu)"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Ostrov"
@@ -29611,10 +29701,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Upraviť Ostrov"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Ostrovček"
@@ -29622,5 +29712,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Upraviť ostrovček"
@@ -29628,5 +29718,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Vstup do jaskyne"
@@ -29634,10 +29724,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Upraviť vstup do jaskyne"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Vrchol"
@@ -29645,10 +29735,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Upraviť vrchol kopca"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Ľadovec"
@@ -29656,10 +29746,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Upraviť ľadovec"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Sopka"
@@ -29667,70 +29757,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Upraviť sopku"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Štátna"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Upraviť štátne hranice"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administratívne"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Upraviť administratívne hranice"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Občianske"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Upraviť občiansku hranicu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Politická"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Upraviť politickú hranicu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Národný park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Využívanie oblasti (Land use)"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Strom"
@@ -29739,15 +29829,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Upraviť strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Botanický názov"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Drevo"
@@ -29756,5 +29846,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Upraviť Drevo"
@@ -29762,17 +29852,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "ihličnatý"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "zmiešaný"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Les"
@@ -29781,14 +29871,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Upraviť les"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Prírodná rezervácia"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Upraviť prírodnú rezerváciu"
@@ -29796,25 +29886,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Sutina"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Upraviť sutinu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Krovie"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Upraviť krovie"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
@@ -29822,5 +29912,5 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr ""
@@ -29828,5 +29918,5 @@
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Vresovisko"
@@ -29834,5 +29924,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Upraviť vresovisko"
@@ -29840,5 +29930,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Farma"
@@ -29847,45 +29937,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Upraviť farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Poľnohospodárska pôda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Upraviť poľnohospodárske pôdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Lúka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Upraviť lúku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Vinica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Upraviť vinicu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Ťažobný priestor"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Upraviť ťažobný priestor"
@@ -29893,25 +29983,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Záhrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Upraviť záhradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Upraviť trávnatú plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Obecná zeleň"
@@ -29919,10 +30009,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Upraviť obecnú zeleň"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Spoločné, obecné"
@@ -29930,20 +30020,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Upraviť spoločné, obecné"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Upraviť park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Rekreačná oblasť"
@@ -29951,5 +30041,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upraviť rekreačnú oblasť"
@@ -29957,15 +30047,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Osídlená oblasť (Residential area)"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Upraviť osídlenú oblasť"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Cintorín (malý, blizko kostola)"
@@ -29973,9 +30063,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Upraviť cintorín (malý, blizko kostola)"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Cintorín"
@@ -29983,39 +30073,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Upraviť cintorín"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Maloobchod"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Upraviť oblasť s maloobchodmi"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Obchodná (komerčná)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Upraviť obchodnú (komerčnú) oblasť"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Priemysel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Upraviť priemyselnú oblasť"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Železničný pozemok"
@@ -30023,15 +30113,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Upraviť železničný pozemok"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Armáda"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Upraviť vojenskú oblasť"
@@ -30039,50 +30129,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Stavebná oblasť"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Upraviť stavebnú oblasť"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Upraviť brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Skládka odpadov"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Upraviť skládku odpadov"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Upraviť lom"
@@ -30092,5 +30182,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Upraviť multipolygón"
@@ -30102,5 +30192,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "obvodová časť (outer segment)"
@@ -30108,5 +30198,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "vnútorná časť (inner segment)"
@@ -30114,5 +30204,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -30123,5 +30213,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -30129,36 +30219,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -30166,5 +30256,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Prikázané smery jazdy (turn restriction)"
@@ -30173,5 +30263,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Upraviť prikázané smery jazdy (turn restriction)"
@@ -30179,34 +30269,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Obmedzenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "zákaz zabočenia vľavo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "zákaz zabočenia vpravo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "zákaz jazdy priamo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "zákaz otáčania sa"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "prikázané odbočenie vpravo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "prikázané odbočenie vľavo"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "zákaz odbočenia"
@@ -30215,15 +30305,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "cez bod alebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "k ceste"
@@ -30231,5 +30321,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Cesta (Route)"
@@ -30238,5 +30328,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Upraviť Cestu (Route)"
@@ -30244,5 +30334,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Typ Cesty (Route)"
@@ -30350,5 +30440,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30359,17 +30449,17 @@
 msgstr "bicykel"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "cesta (vozovka)"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "trajekt (prievoz)"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "lyžovanie"
@@ -30437,5 +30527,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30445,9 +30535,9 @@
 msgstr "pešia (foot)"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "električka"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "obchádzka"
@@ -30461,10 +30551,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro (subway)"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Popis značky"
@@ -30472,31 +30562,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Sieť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Štátna cesta"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "plánovaný"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "náhradný"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "dočasný"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "spojenie"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Farba (hex)"
@@ -30505,30 +30595,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "cestný úsek"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "predný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "zadný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "bod prerušenia"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "predný bod prerušenia"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "zadný bod prerušenia"
@@ -30755,5 +30845,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "zastaralý"
@@ -31406,4 +31496,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -31507,11 +31605,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "človekom vytvorené (manmade)"
@@ -32024,5 +32122,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "hrádza (pier)"
@@ -32036,5 +32134,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "potrubie (pipeline)"
@@ -32178,13 +32276,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "oddych (leisure)"
@@ -32198,5 +32296,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "prístav (marina)"
@@ -32292,10 +32390,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "zaujímavosti (amenity)"
@@ -32397,10 +32495,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "verejná_doprava"
@@ -32838,24 +32936,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "svetelné zariadenie"
@@ -32887,6 +32985,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "osvetlená_voda (light_water)"
@@ -32947,8 +33045,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "zdravie"
@@ -33301,26 +33399,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "obchod"
@@ -33392,8 +33490,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -33494,9 +33592,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "cestovanie"
@@ -33584,9 +33682,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "historické"
@@ -33599,5 +33697,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "lom"
@@ -33611,5 +33709,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "skládka odpadov (landfill)"
@@ -33631,5 +33729,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody"
@@ -33643,5 +33741,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "farmy"
@@ -33664,5 +33762,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "maloobchody"
@@ -33676,5 +33774,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "závody"
@@ -33688,5 +33786,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "brownfield (opustený priemyselný objekt)"
@@ -33700,5 +33798,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)"
@@ -33712,5 +33810,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "železničný pozemok"
@@ -33767,7 +33865,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "armáda"
@@ -33781,5 +33879,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "cintorín (cemetery)"
@@ -33792,5 +33890,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "vrchol (peak)"
@@ -33805,5 +33903,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "ľadovec (glacier)"
@@ -33817,5 +33915,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "sopka"
@@ -33870,8 +33968,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "prírodné (natural)"
@@ -33885,5 +33983,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "oblasť pokrytá krovím"
@@ -33897,5 +33995,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "vresovisko"
@@ -33909,5 +34007,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "zalesnená oblasť (woodarea)"
@@ -33921,5 +34019,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "blato (mud)"
@@ -33933,5 +34031,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "pláž (beach)"
@@ -34009,8 +34107,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "trasa (route)"
@@ -34099,12 +34197,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "hranica (boundary)"
@@ -34254,11 +34352,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "miesto"
@@ -34272,5 +34370,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -34626,6 +34724,19 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "closedway"
-#~ msgstr "uzavratá cesta"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Označená cesta neobsahuje vybratý bod."
+#~ msgstr[1] "Označená cesta neobsahuje všetky vybraté body."
+#~ msgstr[2] "Označená cesta neobsahuje všetky vybraté body."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Stupne minúty sekundy"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Doplnte nejaký komentár pre nahrávanie (min. 3 znaky)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
 
 #~ msgid "Move"
@@ -34691,7 +34802,4 @@
 #~ msgid "y from"
 #~ msgstr "y od"
-
-#~ msgid "Do not show again"
-#~ msgstr "Nezobrazovať v budúcnosti"
 
 #~ msgid ""
@@ -34956,7 +35064,4 @@
 #~ msgstr "verzia na servery:"
 
-#~ msgid "resolved version:"
-#~ msgstr "finálna verzia:"
-
 #~ msgid "osmarender options"
 #~ msgstr "možnosti pre osmarender"
@@ -35096,7 +35201,4 @@
 #~ msgid "Motorboat"
 #~ msgstr "Motorová loď"
-
-#~ msgid "Boat"
-#~ msgstr "Loď"
 
 #~ msgid "Footway"
@@ -35431,4 +35533,7 @@
 #~ msgstr "Server neobsahuje kontroly"
 
+#~ msgid "closedway"
+#~ msgstr "uzavratá cesta"
+
 #~ msgid ""
 #~ "The sources (URL or filename) of tagging preset definition files. See "
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 22568)
+++ applications/editors/josm/i18n/po/sl.po	(revision 22569)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
 "PO-Revision-Date: 2010-06-28 15:54+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-07-28 09:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -24,5 +24,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -53,14 +53,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -77,9 +76,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -122,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -160,5 +159,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -226,5 +225,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -240,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -258,11 +257,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -270,20 +270,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -316,5 +316,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr ""
@@ -382,5 +382,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -394,5 +394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -414,4 +414,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -428,6 +429,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -439,5 +440,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -572,22 +573,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Združi poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Združi več poti v eno samo."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Obrnem smeri?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Obrni in združi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -595,5 +596,5 @@
 msgstr "Poti v trenutnih smereh ni mogoče združiti. Obrnem nekatere od njih?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -601,10 +602,10 @@
 msgstr "Poti se ne da združiti (Vozlišča niso povezana v premem zaporedju)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Združi {0} poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr ""
@@ -649,10 +650,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -790,5 +791,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -854,10 +855,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Izvoz v GPX ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Izvoz v datoteko oblike GPX."
@@ -1047,5 +1048,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr ""
@@ -1458,20 +1459,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1495,5 +1496,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1504,6 +1505,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Napaka"
@@ -1530,5 +1531,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1536,5 +1537,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Shrani trenutne podatke"
@@ -1589,10 +1590,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Shrani kot..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Shrani trenutne podatke v novo datoteko"
@@ -1636,5 +1637,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1661,5 +1662,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr ""
@@ -1728,18 +1729,23 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Razdeli pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Razdeli pot pri izbranem vozlišču."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Izbrana vozlišča niso del iste poti."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1749,5 +1755,5 @@
 msgstr[3] "Izbrana vozlišča niso na sredini nobene poti."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1761,22 +1767,10 @@
 msgstr[3] "Izbrana vozlišča so del več poti. Prosim, izberite tudi pot."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Izbrana vozlišča niso del iste poti."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Izbrana pot ne vsebuje izbranega vozlišča."
-msgstr[1] "Izbrana pot ne vsebuje izbranih vozlišč."
-msgstr[2] "Izbrana pot ne vsebuje izbranih vozlišč."
-msgstr[3] "Izbrana pot ne vsebuje izbranih vozlišč."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Za razdelitev krožne poti izberite dve ali več vozlišč."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1786,5 +1780,5 @@
 "sredini poti.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1792,5 +1786,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1798,5 +1792,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1940,5 +1934,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2902,22 +2896,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3058,25 +3052,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#, java-format
+msgid "Delete node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#, java-format
+msgid "Delete way {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
-msgid "Delete node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
-#, java-format
-msgid "Delete way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
-#, java-format
 msgid "Delete relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3085,5 +3079,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3092,5 +3086,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3099,5 +3093,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3106,5 +3100,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3254,5 +3248,5 @@
 msgstr "Uveljavim?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3335,7 +3329,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Napaka pri nalaganju strani {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3505,42 +3499,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Stopinje Minute Sekunde"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "J"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "S"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "Z"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3548,5 +3545,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3721,5 +3718,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "ozadje"
@@ -3863,5 +3860,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr ""
@@ -3889,5 +3886,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "železnica"
@@ -3909,6 +3906,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -3979,5 +3976,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "zgradba"
@@ -4066,5 +4063,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4159,69 +4156,69 @@
 msgstr "Geslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "uporaba"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Prikaži to pomoč"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Sprejmi pravokotno področje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Sprejmi pravokotno področje GPS podatkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Ponastavi nastavitve na privzete"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4231,9 +4228,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "primeri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4241,46 +4238,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Pripravljanje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Nalaganje zgodnjih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Privzete nastavitve"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Priprava grafičnega uporabniškega vmesnika"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Nalaganje vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Razreši"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4289,5 +4285,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4383,33 +4379,33 @@
 msgstr "Pomanjšaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Geografska dolžina pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Ime predmeta pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Geografska širina pod kazalcem miške."
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+msgid "The angle between the previous and the current way segment."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
-msgid "The angle between the previous and the current way segment."
+msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4417,9 +4413,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(ni predmeta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4434,4 +4430,17 @@
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+msgid "Metric"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "Kovanci"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+msgid "Imperial"
 msgstr ""
 
@@ -5140,5 +5149,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr ""
@@ -5221,6 +5230,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5231,5 +5240,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5358,5 +5367,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr ""
@@ -5417,5 +5426,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5574,5 +5583,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5580,5 +5589,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5586,5 +5595,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5592,5 +5601,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5598,5 +5607,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5605,5 +5614,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5611,5 +5620,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5617,5 +5626,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5623,24 +5632,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5720,51 +5729,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Plasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Odpri seznam vseh naloženih plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Preklopi vidljivost izbrane plasti."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Prikaži/skrij"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Preklopi vidljivost izbrane plasti."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Pomakni izbrano plast vrstico višje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Pomakni izbrano plast vrstico nižje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr ""
@@ -5774,5 +5783,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relacije"
@@ -6925,6 +6934,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6972,107 +6982,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Naziv"
@@ -7410,5 +7420,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7495,5 +7505,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<različno>"
@@ -8226,5 +8236,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8297,8 +8307,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Vrsta"
@@ -8327,6 +8337,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "neznan"
@@ -8647,5 +8657,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr ""
@@ -8704,14 +8714,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+msgid "Enter an upload comment"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9142,5 +9152,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9162,5 +9172,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9168,60 +9178,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Različica"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Gorski prelaz"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Ne prikaži več"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9541,109 +9583,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "točka GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Riši povezave med točkami na tej plasti."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Ne riši povezav med točkami na tej plasti."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Prilagodi barvo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Privzeto"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Izberite barvo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Uvozi zvok"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Zvočne datoteke (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Uvozi slike"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9651,5 +9601,5 @@
 msgstr "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9659,23 +9609,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Opis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9684,5 +9634,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9691,10 +9641,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Pretvori v podatkovno plast"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9702,21 +9652,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9724,10 +9674,10 @@
 msgstr "Sprejmi iz OSM vzdolž te sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Sprejmi vse znotraj:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9735,10 +9685,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9746,21 +9696,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9772,9 +9722,9 @@
 "nadaljevati?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9782,5 +9732,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9788,23 +9738,115 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Riši povezave med točkami na tej plasti."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Ne riši povezav med točkami na tej plasti."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Prilagodi barvo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Privzeto"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Izberite barvo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Uvozi zvok"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Zvočne datoteke (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Uvozi slike"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "izven sprejetega področja"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9813,11 +9855,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9826,36 +9868,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} je sestavljen iz:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Pretvori v plast GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9863,5 +9905,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9870,5 +9912,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -9878,5 +9920,5 @@
 msgstr[3] "točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -9887,5 +9929,5 @@
 msgstr[3] "sled z {0} točkami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -9894,5 +9936,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -9903,24 +9945,28 @@
 msgstr[3] "{0} točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Datoteke GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Napaka pri razčlenjevanju {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ni bilo možno prebrati \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9929,34 +9975,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -9964,93 +10010,93 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10060,20 +10106,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10082,5 +10128,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10088,21 +10134,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10110,17 +10156,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10129,5 +10175,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10136,56 +10182,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Berem {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Slike z geografskim položajem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10194,5 +10236,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10201,10 +10243,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10213,5 +10255,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10307,9 +10349,9 @@
 msgstr "Slike JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10317,5 +10359,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10324,14 +10366,26 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10339,29 +10393,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
@@ -11204,4 +11246,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr ""
@@ -11216,5 +11259,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11317,5 +11360,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Le zanimive smerne puščice (npr enosmerne ceste)"
@@ -11323,5 +11366,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Le na koncu poti."
@@ -11351,5 +11394,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Avtor"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Both"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11357,9 +11413,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11367,9 +11423,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11378,25 +11434,25 @@
 "Nastavite ''-1'' za povezavo vseh točk."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Največja dolžina (metrov)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11404,13 +11460,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Najmanjša razdalja (slikovnih točk)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11418,9 +11474,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Barvaj točke in segmente sledi glede na hitrost."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11428,46 +11484,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+msgid "Waypoint labelling"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "Točke GPS sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Riši nedejavne podatkovne plasti v drugi barvi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Podatki OSM"
@@ -11821,21 +11885,25 @@
 msgstr "Za upoštevanje nekaterih sprememb je potrebno ponovno zagnati JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Geografska projekcija"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Oblika prikaza koordinat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Geografska projekcija"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+msgid "System of measurement"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12378,5 +12446,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12385,49 +12453,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12437,15 +12505,15 @@
 msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12457,17 +12525,17 @@
 msgstr[3] "Spremeni {0} predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Uporabi prednastavitev"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12485,7 +12553,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Iskanje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12494,17 +12561,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Iskanje predmetov."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Povečava na ves izbor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Iskanje predmetov."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12803,5 +12867,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -14243,5 +14307,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14503,5 +14567,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Interpolacija naslovov"
@@ -14843,41 +14907,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -14894,25 +14958,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -14950,18 +15014,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Zgradbe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15185,8 +15249,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr ""
@@ -15247,6 +15311,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr ""
@@ -15712,34 +15776,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Prazna plast"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15748,14 +15812,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -15832,22 +15896,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Mesto vira sprejema"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Sprejmi iz OSM vzdolž te sledi"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Sprejmi področje"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Izberite vsaj dve vozlišči za združitev"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -15862,7 +15922,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Berem {0}..."
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -15893,9 +15953,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15905,5 +15965,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -15912,11 +15972,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr ""
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr ""
@@ -15926,5 +15986,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr ""
@@ -15934,13 +15994,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16179,5 +16239,5 @@
 msgstr ""
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr ""
@@ -16528,8 +16588,6 @@
 msgstr "Odpri okno za merjenje"
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr ""
@@ -16560,5 +16618,5 @@
 msgstr "Kot med dvema izbranima vozliščema"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr ""
@@ -16650,5 +16708,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -16712,13 +16770,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -16830,93 +16888,93 @@
 msgstr ""
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -16958,9 +17016,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17138,20 +17196,24 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "read protocol version"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17160,50 +17222,58 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17211,5 +17281,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr ""
@@ -17408,41 +17478,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Naloži ploščico"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Naloži vse ploščice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -17742,4 +17812,14 @@
 msgid "Terrace"
 msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Ločilo"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18426,6 +18506,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18435,9 +18515,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18516,6 +18596,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18523,5 +18603,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr ""
@@ -18760,32 +18840,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Podvojena vozlišča"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Podvojena vozlišča"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Podvojena vozlišča"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Podvojena vozlišča"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Podvojena vozlišča"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Podvojena vozlišča"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -18822,5 +18896,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr ""
@@ -19337,5 +19411,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr ""
@@ -19471,10 +19545,10 @@
 msgstr ""
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19620,10 +19694,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -19809,28 +19883,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Samodejno sprejemanje"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -19841,65 +19911,69 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Naloži vidne ploščice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Spremeni ločljivost"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Shrani plast WMS v datoteko"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Naloži plast WMS iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Samodejno sprejemanje"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -19978,5 +20052,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20009,5 +20083,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20028,5 +20102,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr ""
@@ -20045,8 +20119,7 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "Regionalna cesta (1.,2. reda)"
+msgstr ""
 
 #. relation type
@@ -20058,8 +20131,7 @@
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "Cevovod"
+msgstr ""
 
 #. relation type
@@ -20071,43 +20143,37 @@
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Umetnina"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "Javni prevoz"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Opis"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "pravilno"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Prilepi"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "vodotok"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20381,7 +20447,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Sprejmi iz OSM vzdolž te sledi"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20578,6 +20643,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20586,5 +20656,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20593,5 +20663,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20600,10 +20670,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20612,5 +20682,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20620,5 +20690,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20627,15 +20697,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20644,5 +20714,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20775,5 +20845,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr ""
@@ -21312,5 +21382,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21323,5 +21393,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr ""
@@ -21625,9 +21695,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "da"
@@ -21737,9 +21807,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr ""
@@ -21998,5 +22068,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr ""
@@ -22045,5 +22115,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr ""
@@ -22078,5 +22148,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr ""
@@ -22163,5 +22233,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr ""
@@ -22196,5 +22266,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22364,14 +22434,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr ""
@@ -22639,6 +22709,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr ""
@@ -23086,5 +23156,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
@@ -23490,5 +23560,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr ""
@@ -23852,31 +23922,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr ""
@@ -23936,90 +24006,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24132,7 +24202,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr ""
@@ -24148,5 +24218,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr ""
@@ -24159,6 +24229,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr ""
@@ -24334,5 +24404,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr ""
@@ -24369,6 +24439,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr ""
@@ -24376,5 +24446,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Klopca"
@@ -24493,5 +24563,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr ""
@@ -24652,5 +24722,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr ""
@@ -24658,73 +24728,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr ""
@@ -24732,17 +24807,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr ""
@@ -24750,9 +24825,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pivnica"
@@ -24760,18 +24835,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Uredi pivnico"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr ""
@@ -24779,9 +24855,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr ""
@@ -24789,24 +24865,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turizem"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Muzej"
@@ -24814,9 +24890,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Uredi muzej"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Živalski vrt"
@@ -24825,9 +24901,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Uredi živalski vrt"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Razgledišče"
@@ -24835,24 +24911,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Uredi razgledišče"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Umetnina"
@@ -24860,5 +24936,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Uredi umetnino"
@@ -24866,19 +24942,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Zemljevid"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -24916,5 +24992,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24922,28 +24998,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -24953,5 +25029,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -24959,5 +25035,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr ""
@@ -24965,6 +25041,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Kolesarjenje"
@@ -24972,5 +25048,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -24978,6 +25054,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Smučanje"
@@ -24985,5 +25061,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -24991,46 +25067,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25038,29 +25121,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr ""
@@ -25068,25 +25151,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Zgodovinski kraji"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Grad"
@@ -25095,19 +25178,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Uredi grad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruševine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Uredi ruševine"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Arheološko najdišče"
@@ -25116,9 +25199,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Uredi arheološko najdišče"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr ""
@@ -25126,10 +25209,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25137,5 +25220,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25143,15 +25226,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr ""
@@ -25159,55 +25242,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Prosti čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Vodni park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Uredi vodni park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Igrišče"
@@ -25215,35 +25298,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Uredi igrišče"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Ribarjenje"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Uredi ribarjenje"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Uredi stadion"
@@ -25257,6 +25340,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "izberite šport:"
@@ -25672,31 +25755,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "šport"
@@ -25706,240 +25789,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "lokostrelstvo"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "košarka"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "plezanje"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "kolesarjenje"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gimnastika"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "strelišče"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "smučanje"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "nogomet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "plavanje"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "namizni_tenis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Športno središče"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Uredi športno središče"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golf igrišče"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Uredi golf igrišče"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Uredi mini golf"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr ""
@@ -25981,23 +26064,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "vrsta"
@@ -26039,211 +26122,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Lokostrelstvo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Uredi lokostrelstvo"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Plezanje"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Uredi plezanje"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Uredi kolesarjenje"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Pasje dirke"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Uredi pasje dirke"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Konjske dirke"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Uredi konjske dirke"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gimnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Uredi gimnastiko"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Plavanje"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Uredi plavanje"
@@ -26251,52 +26334,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Uredi smučanje"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Strelišče"
@@ -26304,204 +26387,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Uredi strelišče"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Šport (z žogo)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Nogomet"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Uredi nogomet"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Košarka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Uredi košarko"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Uredi golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golf_igrišče"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Uredi hokej"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Namizni tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Uredi namizni tenis"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Uredi tenis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Zgradba"
@@ -26509,5 +26592,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Javne zgradbe"
@@ -26515,10 +26598,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Uredi javno zgradbo"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Mestna hiša"
@@ -26526,10 +26609,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Uredi mestno hišo"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Veleposlaništvo"
@@ -26537,10 +26620,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Uredi veleposlaništvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Sodišče"
@@ -26549,10 +26632,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Uredi sodišče"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Zapor"
@@ -26561,10 +26644,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Uredi zapor"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Policijska postaja"
@@ -26574,10 +26657,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Uredi policijsko postajo"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Gasilski dom"
@@ -26586,10 +26669,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Uredi gasilski dom"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Pošta"
@@ -26597,5 +26680,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Uredi pošto"
@@ -26603,15 +26686,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Šola"
@@ -26619,10 +26702,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Uredi šolo"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr ""
@@ -26630,10 +26713,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr ""
@@ -26641,5 +26724,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr ""
@@ -26647,5 +26730,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Kinematograf"
@@ -26654,10 +26737,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Uredi kinematograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Knjižnica"
@@ -26666,9 +26749,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Uredi knjižnico"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr ""
@@ -26676,10 +26759,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Gledališče"
@@ -26688,10 +26771,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Uredi gledališče"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Kraj čaščenja"
@@ -26701,5 +26784,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Uredi kraj čaščenja"
@@ -26708,6 +26791,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Vera"
@@ -26716,66 +26799,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr ""
@@ -26784,81 +26867,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Naslovi"
@@ -26867,5 +26950,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Urejanje podatkov o naslovu"
@@ -26873,5 +26956,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr ""
@@ -26879,25 +26962,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Ime ceste"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Poštna številka"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr ""
@@ -26906,5 +26989,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Uredi interpolacijo naslovov"
@@ -26912,61 +26995,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Stolp"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Uredi stolp"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -26974,25 +27057,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Vodni stolp"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Uredi vodni stolp"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Svetilnik"
@@ -27000,10 +27083,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Uredi svetilnik"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Mlin na veter"
@@ -27011,10 +27094,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Uredi mlin na veter"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Cevovod"
@@ -27023,41 +27106,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Uredi cevovod"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Čistilna naprava"
@@ -27067,10 +27150,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Uredi čistilno napravo"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Žerjav"
@@ -27078,5 +27161,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Uredi žerjav"
@@ -27084,10 +27167,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Geodetska točka"
@@ -27095,10 +27178,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Uredi geodetsko točko"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Video nadzor"
@@ -27106,23 +27189,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Uredi video nadzorno kamero"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr ""
@@ -27132,35 +27215,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr ""
@@ -27169,10 +27252,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr ""
@@ -27181,5 +27264,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -27187,10 +27270,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Steber daljnovoda"
@@ -27201,23 +27284,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Uredi steber daljnovoda"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr ""
@@ -27226,21 +27309,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "Cevovod"
-
-#: build/trans_presets.java:2452
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27248,55 +27330,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Stranišča"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Poštni nabiralnik"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefon"
@@ -27305,5 +27387,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Uredi telefon"
@@ -27311,5 +27393,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Kovanci"
@@ -27317,5 +27399,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Bankovci"
@@ -27323,5 +27405,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27329,5 +27411,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Debetne kartice"
@@ -27335,15 +27417,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Kreditne kartice"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telefonske kartice"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Recikliranje"
@@ -27352,5 +27434,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Uredi raciklažno točko"
@@ -27358,35 +27440,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27394,5 +27476,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27401,31 +27483,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr ""
@@ -27504,39 +27586,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27545,30 +27627,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr ""
@@ -27577,10 +27659,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Pitna voda"
@@ -27589,10 +27671,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Uredi pitno vodo"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -27601,5 +27683,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27607,5 +27689,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr ""
@@ -27613,15 +27695,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Trgovine"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -27629,10 +27711,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -27641,28 +27723,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr ""
@@ -27670,9 +27752,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr ""
@@ -27680,27 +27762,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Mesar"
@@ -27708,9 +27790,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Uredi mesarja"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Pekarna"
@@ -27718,9 +27800,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Uredi pekarno"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr ""
@@ -27728,18 +27810,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr ""
@@ -27747,54 +27829,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr ""
@@ -27802,9 +27884,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr ""
@@ -27812,9 +27894,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Sam svoj mojster"
@@ -27822,54 +27904,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Uredi sam svoj mojster trgovino"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Čistilnica"
@@ -27877,9 +27959,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Uredi čistilnico"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Pralnica"
@@ -27887,9 +27969,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Uredi pralnico"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr ""
@@ -27897,24 +27979,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Prodajni avtomat"
@@ -27922,5 +28004,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Uredi prodajni avtomat"
@@ -27928,97 +28010,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Prodajani izdelki"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "pijača"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM kartice"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Denar"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Banka"
@@ -28026,14 +28108,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Uredi banko"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Menjalnica"
@@ -28041,5 +28123,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Uredi menjalnico"
@@ -28047,15 +28129,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Uredi bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Zdravje"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr ""
@@ -28063,18 +28145,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Lekarna"
@@ -28082,5 +28164,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Uredi lekarno"
@@ -28088,9 +28170,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Bolnišnica"
@@ -28098,10 +28180,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Uredi bolnišnico"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr ""
@@ -28110,5 +28192,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28117,20 +28199,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28138,5 +28220,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr ""
@@ -28145,64 +28227,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Kraji"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Uredi kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Država"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Uredi državo"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr ""
@@ -28210,15 +28292,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr ""
@@ -28226,10 +28308,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr ""
@@ -28237,25 +28319,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Vas"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Uredi vas"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Zaselek"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Uredi zaselek"
@@ -28263,5 +28345,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr ""
@@ -28269,10 +28351,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Otok"
@@ -28280,10 +28362,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Uredi otok"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -28291,5 +28373,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -28297,5 +28379,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr ""
@@ -28303,10 +28385,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Vrh"
@@ -28314,10 +28396,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Uredi vrh"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr ""
@@ -28325,10 +28407,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr ""
@@ -28336,70 +28418,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Meje"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Raba tal"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Drevo"
@@ -28408,15 +28490,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Uredi drevo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr ""
@@ -28425,5 +28507,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr ""
@@ -28431,17 +28513,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Gozd"
@@ -28450,14 +28532,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Uredi gozdnata tla"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Naravni rezervat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Uredi naravni rezervat"
@@ -28465,25 +28547,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr ""
@@ -28491,10 +28573,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr ""
@@ -28502,5 +28584,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr ""
@@ -28508,5 +28590,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr ""
@@ -28515,45 +28597,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Vinograd"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Uredi vinograd"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28561,25 +28643,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -28587,10 +28669,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr ""
@@ -28598,20 +28680,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr ""
@@ -28619,5 +28701,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -28625,15 +28707,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Pokopališče"
@@ -28641,9 +28723,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Uredi pokopališče"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr ""
@@ -28651,39 +28733,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Ozemlje železnice"
@@ -28691,15 +28773,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Uredi ozemlje železnice"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr ""
@@ -28707,50 +28789,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Gradbišče"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Kamnolom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Uredi kamnolom"
@@ -28760,5 +28842,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr ""
@@ -28770,5 +28852,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr ""
@@ -28776,5 +28858,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr ""
@@ -28782,5 +28864,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -28791,5 +28873,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -28797,36 +28879,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -28834,5 +28916,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr ""
@@ -28841,5 +28923,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -28847,34 +28929,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr ""
@@ -28883,15 +28965,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr ""
@@ -28899,5 +28981,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr ""
@@ -28906,5 +28988,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr ""
@@ -28912,5 +28994,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr ""
@@ -29018,5 +29100,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29027,17 +29109,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29105,5 +29187,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29113,9 +29195,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr ""
@@ -29129,10 +29211,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr ""
@@ -29140,31 +29222,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr ""
@@ -29173,30 +29255,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29423,5 +29505,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr ""
@@ -30074,4 +30156,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30175,11 +30265,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr ""
@@ -30692,5 +30782,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr ""
@@ -30704,5 +30794,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr ""
@@ -30846,13 +30936,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr ""
@@ -30866,5 +30956,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr ""
@@ -30960,10 +31050,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr ""
@@ -31065,10 +31155,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -31506,24 +31596,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -31555,6 +31645,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -31615,8 +31705,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr ""
@@ -31969,26 +32059,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr ""
@@ -32060,8 +32150,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr ""
@@ -32162,9 +32252,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr ""
@@ -32252,9 +32342,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr ""
@@ -32267,5 +32357,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr ""
@@ -32279,5 +32369,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr ""
@@ -32299,5 +32389,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr ""
@@ -32311,5 +32401,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr ""
@@ -32332,5 +32422,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr ""
@@ -32344,5 +32434,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr ""
@@ -32356,5 +32446,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr ""
@@ -32368,5 +32458,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr ""
@@ -32380,5 +32470,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr ""
@@ -32435,7 +32525,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr ""
@@ -32449,5 +32539,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr ""
@@ -32460,5 +32550,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr ""
@@ -32473,5 +32563,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr ""
@@ -32485,5 +32575,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr ""
@@ -32538,8 +32628,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr ""
@@ -32553,5 +32643,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr ""
@@ -32565,5 +32655,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr ""
@@ -32577,5 +32667,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -32589,5 +32679,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr ""
@@ -32601,5 +32691,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr ""
@@ -32677,8 +32767,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr ""
@@ -32767,12 +32857,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr ""
@@ -32922,11 +33012,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr ""
@@ -32940,5 +33030,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33294,4 +33384,14 @@
 msgstr ""
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Izbrana pot ne vsebuje izbranega vozlišča."
+#~ msgstr[1] "Izbrana pot ne vsebuje izbranih vozlišč."
+#~ msgstr[2] "Izbrana pot ne vsebuje izbranih vozlišč."
+#~ msgstr[3] "Izbrana pot ne vsebuje izbranih vozlišč."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Stopinje Minute Sekunde"
+
 #~ msgid "Move"
 #~ msgstr "Premakni"
@@ -33487,7 +33587,4 @@
 #~ msgstr "Neznana različica"
 
-#~ msgid "Do not show again"
-#~ msgstr "Ne prikaži več"
-
 #~ msgid "Ill-formed node id"
 #~ msgstr "Neveljaven id točke"
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 22568)
+++ applications/editors/josm/i18n/po/sv.po	(revision 22569)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
 "PO-Revision-Date: 2010-06-07 08:48+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-07-28 09:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -23,5 +23,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -52,14 +52,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -76,9 +75,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -121,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -159,5 +158,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -231,5 +230,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -245,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -263,11 +262,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -275,20 +275,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -321,5 +321,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Sammanfoga"
@@ -389,5 +389,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -401,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -421,4 +421,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -435,6 +436,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -446,5 +447,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -579,22 +580,22 @@
 msgstr "Laddar ner påbörjade changesets..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Slå ihop sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Förena flera sträckor till en enda."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Ändra riktning?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Byt riktning och slå ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -604,5 +605,5 @@
 "några av dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -612,10 +613,10 @@
 "noder av dem)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Slå ihop {0} sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Välj åtminstone två sträckor att slå ihop"
@@ -662,10 +663,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -804,5 +805,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -868,10 +869,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Exportera till GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Exportera data till en GPX-fil"
@@ -1063,5 +1064,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1490,20 +1491,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1527,5 +1528,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1536,6 +1537,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Fel"
@@ -1562,5 +1563,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1568,5 +1569,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Spara nuvarande data."
@@ -1623,10 +1624,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Spara som..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Spara nuvarande data i en ny fil."
@@ -1672,5 +1673,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1697,5 +1698,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Nej, avbryt"
@@ -1765,18 +1766,24 @@
 msgstr[1] "Förenkla sträcka (ta bort {0} noder)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Dela sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Dela sträckan vid vald nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Det går inte att dela baserat på nuvarande urval."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "De valda noderna ingår inte i samma sträcka."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1784,5 +1791,5 @@
 msgstr[1] "De valda noderna ligger inte inuti någon sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1798,20 +1805,10 @@
 "sträckan."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "De valda noderna ingår inte i samma sträcka."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Den valda sträckan innehåller inte den valda noden."
-msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Du måste välja två eller fler noder för att dela en sluten sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1821,5 +1818,5 @@
 "sträckan.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1829,5 +1826,5 @@
 "<br>Du bör verifiera detta och korrigera om nödvändigt.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1837,5 +1834,5 @@
 "<br>Du bör verifiera detta och korrigera om nödvändigt.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1989,5 +1986,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2994,22 +2991,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3152,25 +3149,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#, java-format
+msgid "Delete node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#, java-format
+msgid "Delete way {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
-msgid "Delete node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
-#, java-format
-msgid "Delete way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
-#, java-format
 msgid "Delete relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3179,5 +3176,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3186,5 +3183,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3193,5 +3190,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3200,5 +3197,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3351,5 +3348,5 @@
 msgstr "Tillämpa?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3424,7 +3421,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Fel vid läsning av filer från folder {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
@@ -3434,7 +3431,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Fel uppstod när cache-biblioteket skulle skapas: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3604,42 +3601,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Grader Minuter Sekunder"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "S"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "N"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "V"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "Ö"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3647,5 +3647,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3814,5 +3814,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "bakgrund"
@@ -3956,5 +3956,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr ""
@@ -3982,5 +3982,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "järnväg"
@@ -4002,6 +4002,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "byggnad (building)"
@@ -4155,5 +4155,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4254,69 +4254,69 @@
 msgstr "Lösenord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "användning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "alternativ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Visa denna hjälptext"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard unix-geometri-argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Hämta hem området inom gränsvärdena"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Hämta platsen som anges i url:en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Hämta området innanför gränsvärden som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Gör urval med angivet sökkriterium"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Öppna i maximerat läge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Återställ inställningarna till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4326,9 +4326,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "exempel"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4336,46 +4336,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initierar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Hämtar tidiga insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Anger förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Skapar huvudgränssnittet"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Hämtar insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Jämka"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4384,5 +4383,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4478,33 +4477,33 @@
 msgstr "Zooma ut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "skala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Den geografiska longituden vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Namnet på objektet vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Den geografiska latituden vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Vinkeln mellan föregående och pågående delsträcka."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Kompassriktning för den delsträcka som ritas."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Längden hos den nya delsträcka som håller på att ritas."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4512,9 +4511,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(inget objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4530,4 +4529,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Tillfartsväg"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "kinesiskt"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Affärsområde"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5235,5 +5249,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "alla"
@@ -5316,6 +5330,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5326,5 +5340,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5453,5 +5467,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr ""
@@ -5512,5 +5526,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5670,5 +5684,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5676,5 +5690,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5682,5 +5696,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5688,5 +5702,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5694,5 +5708,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5701,5 +5715,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5707,5 +5721,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5713,5 +5727,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5719,24 +5733,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5816,51 +5830,51 @@
 msgstr "Stäng dialogrutan men skapa ingen nod"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Öppna en lista av alla inlästa lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Alternera visning av det valda lagret."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Visa/Dölj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Alternera visning av det valda lagret."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Flytta det valda lagret en rad upp."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Flytta det valda lagret en rad ner."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr ""
@@ -5870,5 +5884,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Relationer"
@@ -7023,6 +7037,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7070,107 +7085,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Namn"
@@ -7508,5 +7523,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7593,5 +7608,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<olika>"
@@ -8321,5 +8336,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8392,8 +8407,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Typ"
@@ -8422,6 +8437,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "okänd"
@@ -8742,5 +8757,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr ""
@@ -8804,14 +8819,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Ge en kort kommentar till de ändringar som du skickar in:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Skriv in din kommentar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9242,5 +9258,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9262,5 +9278,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9268,60 +9284,92 @@
 msgstr "Inställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Skicka in ändringar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Återställ"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Fortsätt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Visa inte igen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9641,103 +9689,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Anpassa linjeritning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Använd globala inställningar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Rita linjer mellan punkter i detta lager."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Rita inte linjer mellan punkter i detta lager."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Välj alternativ för linjeritning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Anpassa färger"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Välj en färg"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Markörer från namngivna punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Namngivna spårpunkter från {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Importera ljud"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-ljudfiler (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Ljudmarkörer från {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Importera bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9745,5 +9701,5 @@
 msgstr "Namn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9751,5 +9707,5 @@
 msgstr "Beskrivning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9759,23 +9715,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Beskrivning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Längd: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9784,5 +9740,5 @@
 msgstr[1] "{0} rutter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9791,10 +9747,10 @@
 msgstr[1] "{0} sträckpunkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Omvandla till datalager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9804,21 +9760,21 @@
 "skicka in spår, se här:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Omvandlad från:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9826,10 +9782,10 @@
 msgstr "Hämta från OSM längs med detta spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Hämta allting inom:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9837,10 +9793,10 @@
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Största tillåtna område per begäran:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9848,21 +9804,21 @@
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9874,9 +9830,9 @@
 "Önskar du<br>fortsätta?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9886,5 +9842,5 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9894,23 +9850,115 @@
 "kunna uppskattas med någon rimlighet uteslöts."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Anpassa linjeritning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Använd globala inställningar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Rita linjer mellan punkter i detta lager."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Rita inte linjer mellan punkter i detta lager."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Välj alternativ för linjeritning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Anpassa färger"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Välj en färg"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Markörer från namngivna punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Namngivna spårpunkter från {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Importera ljud"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-ljudfiler (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Ljudmarkörer från {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Importera bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datalager {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "utanför hämtat område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9919,11 +9967,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9932,36 +9980,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Omvandla till gpx-lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9969,5 +10017,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9976,5 +10024,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -9982,5 +10030,5 @@
 msgstr[1] "punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -9989,5 +10037,5 @@
 msgstr[1] "ett spår med {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -9996,5 +10044,5 @@
 msgstr[1] "{0} består av {1} spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10003,24 +10051,28 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Korrelerar med GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Filen {0} är fortfarande aktiv under namnet \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fel vid tolkning {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kunde inte öppna \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10032,34 +10084,34 @@
 "välj en tidzon<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Fototid (från exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Gps-tid (läst från fotot ovan): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Jag är i följande tidzon: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Inget datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Öppna ett annat foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synkronisera tid med hjälp av ett foto av GPS-mottagaren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10069,93 +10121,93 @@
 "Använd begärt format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Ogiltigt datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<Inget GPX-spår har hämtats än>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX-spår: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Öppna ett annat foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Auto-gissa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Tidszon: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Förskjutning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Sätt bilder i relation till GPX-spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Korrelera"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Ogiltig tidszon"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Ogiltig förskjutning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10165,20 +10217,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidszon: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10187,5 +10239,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10193,21 +10245,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Matchning av fotografier mot spår misslyckades"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Justera tidszon och tidsförskjutning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "De markerade fotografierna innehåller ingen tidsinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Fotografierna innehåller ingen tidsinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10216,17 +10268,17 @@
 "Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX-spåret saknar tidsinformation"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Välj ett GPX-spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Inget GPX-spår har valts"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10237,5 +10289,5 @@
 "Förväntat format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10246,56 +10298,52 @@
 "Förväntat format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extraherar GPS-plats från EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Påbörjar foldergenomläsning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Läs in foton..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Läser {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Läser igenom folder {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fel vid läsning av filer från folder {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotaggade bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Korrelerar med GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10304,5 +10352,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10311,10 +10359,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10323,5 +10371,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10421,9 +10469,9 @@
 msgstr "JPEG-bilder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps-markör"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10431,5 +10479,5 @@
 msgstr[1] "markörer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10438,14 +10486,26 @@
 msgstr[1] "{0} består av {1} markörer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Växla visning av markörtext och ikoner."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Synkronisera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Du behöver pausa ljudet precis när du hör synkroniseringsindikatorn."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10453,14 +10513,14 @@
 msgstr "Ljud synkroniserat vid punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Det går inte att synkronisera i det lager som spelas upp."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Skapa ljudmarkör vid spelhuvud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10469,16 +10529,4 @@
 "Du måste ha pausat ljudet vid den punkt på spåret där du vill placera "
 "markören."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Växla visning av markörtext och ikoner."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11334,4 +11382,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Inget"
@@ -11346,5 +11395,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11447,5 +11496,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11455,5 +11504,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Enbart på en sträckas huvud."
@@ -11483,5 +11532,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Upphovsman"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Båt"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11491,9 +11554,9 @@
 "tillgängliga sträckpunkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Rita linjer mellan råa GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11503,9 +11566,9 @@
 "längd."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11514,10 +11577,10 @@
 "längd."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Maxlängd (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11526,10 +11589,10 @@
 "linjeinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Rita riktningspilar för linjer, som förbinder GPS-punkter"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11538,5 +11601,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11546,13 +11609,13 @@
 "senast ritade pil."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Minimiavstånd (pixlar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Rita större punkter för GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11562,9 +11625,9 @@
 "hjälp av lagerhanteraren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Färglägg punkter och spåravsnitt baserat på hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11572,37 +11635,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Spår- och punktfärgläggning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "WayPoint-bild"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Rita riktningsanvisningar för delsträckor."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Rita ordningsnummer för alla delsträckor inom deras sträcka."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Använd antialiasing för att ge kartan ett jämnare utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rita gränser för data hämtade från servern."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11610,9 +11682,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Rita de inaktiva datalagren i avvikande färg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -11970,21 +12042,26 @@
 "Du behöver starta om JOSM för att vissa inställningar skall slå igenom."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Projektionsmetod"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Visa koordinater som"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Projektionsmetod"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Lager för att utföra mätningar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Kartprojektion"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12527,5 +12604,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12534,49 +12611,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Mer information om denna funktion"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Valfria attribut:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Okänd typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12586,15 +12663,15 @@
 msgstr "Kunde inte läsa källan till snabbval för taggning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fel vid tolkning {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Objekt av typ {0} stöds."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12604,17 +12681,17 @@
 msgstr[1] "Ändra {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Inget markerat!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Urvalet passar inte!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Tillämpa snabbval"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12632,7 +12709,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Sök: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12641,17 +12717,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Sök efter objekt."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Zooma till urval"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Sök: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12950,5 +13023,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument"
@@ -14395,5 +14468,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14664,5 +14737,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -15004,41 +15077,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15055,25 +15128,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15111,18 +15184,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Byggnader"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15346,8 +15419,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "vatten"
@@ -15408,6 +15481,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "adress"
@@ -15879,34 +15952,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Tomt lager"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS-lager ({0}), {1} ruta/rutor inlästa"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Är inte vektoriserad"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr "Är vektoriserad"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15917,14 +15990,14 @@
 "Skapa en ny."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Cacheformatsfel"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -16001,22 +16074,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Ladda ner objekt..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Hämta från OSM längs med detta spår"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Hämta område"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Välj åtminstone en uppgift att hämta"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16031,7 +16100,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Fel vid tolkning {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16062,9 +16131,9 @@
 msgstr "Skapa en dubblett av sträcka"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Lager för editering av GPX-spår"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konvertera till GPX-lager med anonymiserad tid"
@@ -16074,5 +16143,5 @@
 msgstr "RedigeraGpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "redigera GPX-spår"
@@ -16081,11 +16150,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Importera sträckning från GPX-lager"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Glöm existerande sträckning"
@@ -16095,5 +16164,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Inget GPX-datalager kunde hittas."
@@ -16103,13 +16172,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16351,5 +16420,5 @@
 msgstr "Visa bilder utan geotaggning"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Importerade bilder"
@@ -16710,8 +16779,6 @@
 msgstr "Öppna mätlistan."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Återställ"
@@ -16742,5 +16809,5 @@
 msgstr "Vinkel mellan två valda noder"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Lager för att utföra mätningar"
@@ -16832,5 +16899,5 @@
 msgstr "Hämtningsloop för OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Visar problemfall från OpenStreetBugs"
@@ -16899,13 +16966,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17019,93 +17086,93 @@
 msgstr "Firefox-applikationen"
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -17147,9 +17214,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17327,20 +17394,24 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "read protocol version"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "bekräfta alla fjärrstyrda handlingar manuellt"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "En insticksmodul som låter JOSM kontrolleras från andra applikationer."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Fjärrstyrning"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Inställningar för insticksmodulen Fjärrstyrning"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17352,50 +17423,58 @@
 "applikationer i kommunikation med insticksmodulen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Tillåtna handlingar"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Fjärrstyrning har begärts för att hämta data från API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaljer om begäran: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Vill du tillåta detta?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Bekräfta fjärrstyrd handling"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Fjärrstyrning har begärts för att importera data från följande URL:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17403,5 +17482,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Återgå"
@@ -17600,41 +17679,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Glidande karta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Hämta ruta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Hämta alla rutor"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Öka zoomläge"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Minska zoomläge"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -17939,4 +18018,14 @@
 msgid "Terrace"
 msgstr "Husrad"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Avgränsare"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18623,6 +18712,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18632,9 +18721,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18713,6 +18802,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18720,5 +18809,5 @@
 msgstr "Valideringsfel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Inga valideringsfel"
@@ -18960,32 +19049,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Dubbletter av noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Dubbletter av noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Dubbletter av noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Dubbletter av noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Dubbletter av noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Dubbletter av noder"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19022,5 +19105,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19550,5 +19633,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "yta (area)"
@@ -19692,10 +19775,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19841,10 +19924,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20030,28 +20113,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Automatisk hämtning"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, 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:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20062,65 +20141,69 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Hämta de rutor som syns"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 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:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Läs om felaktiga rutor"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Alfakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Spara WMS-lagret till en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Hämta WMS-lager från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Fel filformat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Fel vid läsning av fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Automatisk hämtning"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20200,5 +20283,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20233,5 +20316,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20252,5 +20335,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "skog"
@@ -20269,71 +20352,61 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "gräns"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Mätningar"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "Lutning"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "Multipolygon"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Konst"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "Kollektivtrafik"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Begränsning"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "rutt"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Klistra in"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "vattendrag"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20607,7 +20680,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Hämta från OSM längs med detta spår"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20808,6 +20880,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20816,5 +20893,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20823,5 +20900,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20830,10 +20907,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20842,5 +20919,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20850,5 +20927,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20857,15 +20934,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20874,5 +20951,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21005,5 +21082,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Referens"
@@ -21542,5 +21619,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21553,5 +21630,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "skog"
@@ -21855,9 +21932,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "ja"
@@ -21967,9 +22044,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "nej"
@@ -22228,5 +22305,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "bostadsgata"
@@ -22275,5 +22352,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "tillfartsväg"
@@ -22308,5 +22385,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "under byggnad"
@@ -22393,5 +22470,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr ""
@@ -22426,5 +22503,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22594,14 +22671,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operatör"
@@ -22869,6 +22946,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Höjd"
@@ -23316,5 +23393,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "kärr"
@@ -23720,5 +23797,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Spänning"
@@ -24082,31 +24159,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Öppettider"
@@ -24166,90 +24243,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24362,7 +24439,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Referensnummer"
@@ -24378,5 +24455,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "underjordisk"
@@ -24389,6 +24466,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Avgift"
@@ -24564,5 +24641,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "Rullstol"
@@ -24599,6 +24676,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Vindskydd"
@@ -24606,5 +24683,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Bänk"
@@ -24723,5 +24800,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Fyrbåk"
@@ -24882,5 +24959,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Kök"
@@ -24888,73 +24965,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italienskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "kinesiskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "hamburgare"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "grekiskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "tyskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "indiskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "lokalt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "turkiskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asiatiskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thailändskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexikanskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japanskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Snabbmat"
@@ -24962,17 +25044,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Redigera en snabbmatsrestaurang"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Kafé"
@@ -24980,9 +25062,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Redigera kafé"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub"
@@ -24990,18 +25072,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Redigera pub"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Redigera Biergarten"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr ""
@@ -25009,9 +25092,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -25019,24 +25102,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Redigera nattklubb"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Sevärdhet"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Redigera sevärdhet"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Museum"
@@ -25044,9 +25127,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Redigera museum"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Zoo"
@@ -25055,9 +25138,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Redigera zoo"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Utsiktsplats"
@@ -25065,24 +25148,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Redigera utsiktsplats"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Utsiktstorn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Nöjespark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Redigera en nöjespark"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Konst"
@@ -25090,5 +25173,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Redigera konstverk"
@@ -25096,19 +25179,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Karta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -25146,5 +25229,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25152,28 +25235,28 @@
 msgstr "gata"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -25183,5 +25266,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Rutter visas för:"
@@ -25189,5 +25272,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "Vandringsled"
@@ -25195,6 +25278,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Cykling"
@@ -25202,5 +25285,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -25208,6 +25291,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Skidåkning"
@@ -25215,5 +25298,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -25221,46 +25304,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Informationstavla"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "historiskt"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "naturfenomen"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "djurliv"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25268,29 +25358,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Redigera vindskydd"
@@ -25298,25 +25388,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Eldstad"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Picknickplats"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Redigera picknickplats"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Historiska platser"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Slott"
@@ -25325,19 +25415,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Redigera slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Redigera ruiner"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Utgrävningsplats"
@@ -25346,9 +25436,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Redigera utgrävningsplats"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Krigsskådeplats"
@@ -25356,10 +25446,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Redigera krigsskådeplats"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Paleografisk plats"
@@ -25367,5 +25457,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Redigera paleografisk plats"
@@ -25373,15 +25463,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Redigera monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Minnesmärke"
@@ -25389,55 +25479,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Redigera minnesmärke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Vägkors"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Redigera ett vägkors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Vägaltare"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Redigera ett vägaltare"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Nöje"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Badanläggning"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Redigera badanläggning"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Lekplats"
@@ -25445,35 +25535,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Redigera lekplats"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Fiske"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Redigera fiske"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Idrott"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Sportfaciliteteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Redigera stadion"
@@ -25487,6 +25577,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "välj sport:"
@@ -25902,31 +25992,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "sport"
@@ -25936,240 +26026,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "flera"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "bågskytte"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "friidrott"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "australisk fotboll"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "basket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "boule"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "kanot"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "klättring"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "kricket_nät"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "hundracing"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "ridsport"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "hästkapplöpning"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "rackets"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "skytte"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "skridskoåkning"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "skidåkning"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "fotboll"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "simning"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Sporthall"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Redigera sporthall"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Plan"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Redigera plan"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Bana"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Redigera bana"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golfbana"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Redigera golfbana"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Redigera minigolfbana"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Flera"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Redigera flersportsfacilitet"
@@ -26211,23 +26301,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "typ"
@@ -26269,211 +26359,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "plan"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "sporthall"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Friidrott"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Redigera friidrott"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Bågskytte"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Redigera bågskytte"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Klättring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Redigera klättring"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Kanotpaddling"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Redigera kanotpaddling"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Redigera cykling"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Hundkapplöpning"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Redigera hundkapplöpning"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Ridsport"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Redigera ridsport"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Hästkapplöpning"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Redigera hästkapplöpning"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Redigera gymnastik"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Redigera motorsport"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Skridskoåkning"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Redigera skridskoåkning"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Redigera skateboard"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Simning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Redigera simning"
@@ -26481,52 +26571,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Redigera skidåkning"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Skidspårstyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "utförsåkning"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "längdskidåkning"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Svårighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "nybörjare"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "lätt"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "ospårat"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Skytte"
@@ -26534,204 +26624,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Redigera skytte"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Bollsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Fotboll"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Redigera fotboll"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Australisk fotboll"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Redigera australisk fotboll"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Redigera baseball"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basket"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Redigera basket"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Redigera golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golf_bana"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Redigera boule"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Redigera cricket"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Cricketnät"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Redigera cricketnät"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Redigera krocket"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Redigera ishockey"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Redigera pelota"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Rackets"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Redigera rackets"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Redigera bordtennis"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Redigera tennis"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Byggnad"
@@ -26739,5 +26829,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Offentlig byggnad"
@@ -26745,10 +26835,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Redigera offentlig byggnad"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Stadshus"
@@ -26756,10 +26846,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Redigera stadshus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Ambassad"
@@ -26767,10 +26857,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Redigera ambassad"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Domstol"
@@ -26779,10 +26869,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Redigera domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Fängelse"
@@ -26791,10 +26881,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Redigera fängelse"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Polisstation"
@@ -26804,10 +26894,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Redigera polisstation"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -26816,10 +26906,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Redigera brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Postkontor"
@@ -26827,5 +26917,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Redigera postkontor"
@@ -26833,15 +26923,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Redigera barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Skola"
@@ -26849,10 +26939,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Redigera skola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Högskola/universitet"
@@ -26860,10 +26950,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Redigera högskola/universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Högskola"
@@ -26871,5 +26961,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Redigera högskola"
@@ -26877,5 +26967,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Biograf"
@@ -26884,10 +26974,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Redigera biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Bibliotek"
@@ -26896,9 +26986,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Redigera bibliotek"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Konstcenter"
@@ -26906,10 +26996,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Redigera konstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Teater"
@@ -26918,10 +27008,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Redigera teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Religiös helgedom"
@@ -26931,5 +27021,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Redigera religiös helgedom"
@@ -26938,6 +27028,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Religion"
@@ -26946,66 +27036,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "buddism"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "kristendom"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hinduism"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "judendom"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "daoism"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "zoroastrianism"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Samfund"
@@ -27014,81 +27104,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglikaner"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptister"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "katoliker"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "evangelister"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "jehovas_vittnen"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "luteraner (inkl. Svenska kyrkan)"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "metodister"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pinstvänner"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbytarianer"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestanter"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "kväkare"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "shiamuslimer"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunnimuslimer"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Adresser"
@@ -27097,5 +27187,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Redigera adressinformation"
@@ -27103,5 +27193,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Husnummer"
@@ -27109,25 +27199,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Husnamn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Gatunamn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Stadsnamn"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Landskod"
@@ -27136,5 +27226,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Redigera adressinterpolation"
@@ -27142,61 +27232,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Numreringsschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "udda"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "jämn"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Byggnadsverk"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Redigera fabriksbyggnad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Redigera torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -27204,25 +27294,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Vattentorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Redigera vattentorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gasklocka"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Redigera gasklocka"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Fyrtorn"
@@ -27230,10 +27320,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Fyrtorn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Väderkvarn"
@@ -27241,10 +27331,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Redigera väderkvarn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Rörledning"
@@ -27253,41 +27343,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Redigera rörledning"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "naturgas"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Plats"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Reningsverk"
@@ -27297,10 +27387,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Redigera reningsverk"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Kran"
@@ -27308,5 +27398,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Redigera kran"
@@ -27314,10 +27404,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Redigera fyrbåk"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Mätpunkt"
@@ -27325,10 +27415,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Redigera mätpunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Övervakning"
@@ -27336,23 +27426,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Redigera övervakningskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -27362,35 +27452,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Redigera ett kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "vindkraft"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "vattenkraft"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fossila bränslen"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "kärnkraft"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "kolkraft"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "solkraft"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Kraftstation"
@@ -27399,10 +27489,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Redigera en kraftstation"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -27411,5 +27501,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Redigera en transformatorstation"
@@ -27417,10 +27507,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Kraftledningsmast"
@@ -27431,23 +27521,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Redigera en kraftledningsmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Kraftledning"
@@ -27456,78 +27546,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Redigera en kraftledning"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "Lutning"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "motorvägslänk"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Inrättningar"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Toaletter"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Anteckning"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Brevlåda"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefon"
@@ -27536,5 +27624,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Redigera en telefon"
@@ -27542,5 +27630,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Mynt"
@@ -27548,5 +27636,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Anteckningar"
@@ -27554,5 +27642,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Betalkort"
@@ -27560,5 +27648,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Kontokort"
@@ -27566,15 +27654,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Återvinning"
@@ -27583,5 +27671,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Redigera en återvinningsstation"
@@ -27589,35 +27677,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Burkar"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Kläder"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Papper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Metallskrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27625,5 +27713,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27632,31 +27720,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr ""
@@ -27735,39 +27823,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Jakttorn"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Redigera ett jakttorn"
@@ -27776,30 +27864,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Höjd"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "låg"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Dölj"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Fontän"
@@ -27808,10 +27896,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Redigera en fontän"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Dricksvatten"
@@ -27820,10 +27908,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Redigera dricksvattensfacilitet"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -27832,5 +27920,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27838,5 +27926,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr ""
@@ -27844,15 +27932,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Affärer"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -27860,10 +27948,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Redigera bilförsäljare"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -27872,28 +27960,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Redigera cykelaffär"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Stormarknad"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Redigera stormarknad"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Hygien"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Redigera hygienbutik"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Närköp"
@@ -27901,9 +27989,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Redigera närköp"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -27911,27 +27999,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Redigera kiosk"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Bokhandel"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Redigera bokhandel"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Resebyrå"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Redigera resebyrå"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "Slakteri"
@@ -27939,9 +28027,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Redigera slakteri"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Bageri"
@@ -27949,9 +28037,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Redigera bageri"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Florist"
@@ -27959,18 +28047,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Redigera florist"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -27978,54 +28066,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Redigera alkoholbutik"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Drycker"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Dator"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Redigera datoraffär"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Elektronik"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Redigera elektronikaffär"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Redigera hifi-affär"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Möbler"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Redigera möbelaffär"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Trädgårdscenter"
@@ -28033,9 +28121,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Redigera trädgårdscenter"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Järnvaror"
@@ -28043,9 +28131,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Redigera järnaffär"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Gör-det-själv-affär"
@@ -28053,54 +28141,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Redigera gör-det-själv-affär"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Kontorsmaterial"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Redigera pappershandel"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Hårfrisör"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Redigera hårfrisör"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Skor"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Redigera skoaffär"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Leksaker"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Redigera leksaksaffär"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Videobutik"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Redigera videobutik"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Kemtvätt"
@@ -28108,9 +28196,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Redigera kemtvätt"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Tvätteri"
@@ -28118,9 +28206,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Redigera tvätteri"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Friluftsliv"
@@ -28128,24 +28216,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Redigera affär för friluftsliv"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Redigera sportaffär"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Redigera optiker"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Automat"
@@ -28153,5 +28241,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Redigera en automat"
@@ -28159,97 +28247,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Varor till försäljning"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "biljetter för allmänna transportmedel"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "parkeringsbiljetter"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "dryck"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "godis"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "foton"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "djurmat"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "tidningar"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "leksaker"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "frimärken"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "hundpåsar"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Pengar"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Bank"
@@ -28257,14 +28345,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Redigera bank"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Uttagsautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Växlingskontor"
@@ -28272,5 +28360,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Redigera växlingskontor"
@@ -28278,15 +28366,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Redigera uttagsautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Hälsovård"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Läkare"
@@ -28294,18 +28382,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Redigera läkare"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Tandläkare"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Redigera tandläkare"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -28313,5 +28401,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Redigera apotek"
@@ -28319,9 +28407,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Receptutlämnande"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Sjukhus"
@@ -28329,10 +28417,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Redigera sjukhus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr ""
@@ -28341,5 +28429,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28348,20 +28436,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "Använd internationellt format, ex +12-345-67890"
@@ -28369,5 +28457,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Veterinär"
@@ -28376,64 +28464,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Redigera veterinär"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Platser"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Redigera en kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Redigera land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Delstat"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Redigera delstat"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Redigera region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Län"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Redigera län"
@@ -28441,15 +28529,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Stad"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Redigera stad"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Småstad"
@@ -28457,10 +28545,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Redigera småstad"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Förort"
@@ -28468,25 +28556,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Redigera förort"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Mindre tätort"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Redigera mindre tätort"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Småort"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Redigera småort"
@@ -28494,5 +28582,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Plats"
@@ -28500,10 +28588,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Redigera plats"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Ö"
@@ -28511,10 +28599,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Redigera ö"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Holme"
@@ -28522,5 +28610,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Redigera holme"
@@ -28528,5 +28616,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Grottöppning"
@@ -28534,10 +28622,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Redigera en grottöppning"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Topp"
@@ -28545,10 +28633,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Redigera topp"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Glaciär"
@@ -28556,10 +28644,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Redigera en glaciär"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Vulkan"
@@ -28567,70 +28655,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Redigera en vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Gränser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Nationell"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Redigera nationsgränser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Administrativ"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Redigera administrativa gränser"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Civilrättslig"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Redigera en civilrättslig gräns"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Redigera politiska gränser"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Redigera gräns för nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Markanvändning"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Träd"
@@ -28639,15 +28727,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Redigera ett träd"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Botaniskt namn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Naturskog"
@@ -28656,5 +28744,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Redigera naturskog"
@@ -28662,17 +28750,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "barrskog"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "lövskog"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "blandskog"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Kulturskog"
@@ -28681,14 +28769,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Redigera användning av mark för skogsbruk"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Redigera naturreservat"
@@ -28696,25 +28784,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Bergsluttning (med lösa stenar)"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Redigera bergssluttning (med lösa stenar)"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Buskage"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Redigera buskage"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Höglandshed"
@@ -28722,10 +28810,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Redigera en höglandshed"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Hed"
@@ -28733,5 +28821,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Redigera hed"
@@ -28739,5 +28827,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Gårdsplan"
@@ -28746,45 +28834,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Redigera markanvändning som gårdsplan"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Jordbruksmark"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Redigera användning av mark för jordbruk"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Äng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Redigera markanvändning som äng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Redigera användning av mark för vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Kolonilotter"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Redigera användning av mark för koloniområden"
@@ -28792,25 +28880,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Trädgård"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Redigera trädgård"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Gräs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Redigera markanvändning som gräsyta"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Allmänning"
@@ -28818,10 +28906,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Redigera användning av mark för allmänning"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Allmänning"
@@ -28829,20 +28917,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Redigera allmänning"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Redigera park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Fritidsområde"
@@ -28850,5 +28938,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Redigera användning av mark för fritidsområde"
@@ -28856,15 +28944,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Bostadsområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Redigera användning av mark för bostadsområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Kyrkogård"
@@ -28872,9 +28960,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Redigera kyrkogård"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Begravningsplats"
@@ -28882,39 +28970,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Redigera användning av mark för begravningsplats"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Detaljhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Redigera användning av mark för detaljhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Affärsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Redigera användning av mark för affärsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Redigera användning av mark för industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Järnvägsmark"
@@ -28922,15 +29010,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Redigera användning av mark för järnvägsmark"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Militärt område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Redigera användning av mark för militärt område"
@@ -28938,50 +29026,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Byggnadsplats"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Redigera markanvändning som byggnadsplats"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Deponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Redigera användning av mark för deponi av avfall"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Stenbrott"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Redigera användning av mark för stenbrott"
@@ -28991,5 +29079,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Redigera en multipolygon"
@@ -29001,5 +29089,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "yttre segement"
@@ -29007,5 +29095,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "inre segment"
@@ -29013,5 +29101,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -29022,5 +29110,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -29028,36 +29116,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29065,5 +29153,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr ""
@@ -29072,5 +29160,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29078,34 +29166,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Begränsning"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "ingen_vänstersväng"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "ingen_högersväng"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "inte_rakt_fram"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "ingen_u_sväng"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "enbart_högersväng"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "enbart_vänstersväng"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "enbart_rakt_fram"
@@ -29114,15 +29202,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "från sträcka"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "via nod eller sträcka"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "till sträcka"
@@ -29130,5 +29218,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Rutt"
@@ -29137,5 +29225,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Redigera rutt"
@@ -29143,5 +29231,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Ruttyp"
@@ -29249,5 +29337,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29258,17 +29346,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29336,5 +29424,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29344,9 +29432,9 @@
 msgstr "fot"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr ""
@@ -29360,10 +29448,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "tunnelbana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr ""
@@ -29371,31 +29459,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr ""
@@ -29404,30 +29492,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29654,5 +29742,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "förlegad"
@@ -30305,4 +30393,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30406,11 +30502,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "byggnadsverk"
@@ -30923,5 +31019,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "pir"
@@ -30935,5 +31031,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "rörledning"
@@ -31077,13 +31173,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "fritid"
@@ -31097,5 +31193,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "marina"
@@ -31191,10 +31287,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "inrättning"
@@ -31296,10 +31392,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "trafikinrättning"
@@ -31737,24 +31833,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -31786,6 +31882,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -31846,8 +31942,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "hälsa"
@@ -32200,26 +32296,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "affär"
@@ -32291,8 +32387,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotell"
@@ -32393,9 +32489,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turism"
@@ -32483,9 +32579,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "historisk"
@@ -32498,5 +32594,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "stenbrott"
@@ -32510,5 +32606,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr ""
@@ -32530,5 +32626,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "hamnbassäng"
@@ -32542,5 +32638,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "gårdsplan"
@@ -32563,5 +32659,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "detaljhandel"
@@ -32575,5 +32671,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "industri"
@@ -32587,5 +32683,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr ""
@@ -32599,5 +32695,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr ""
@@ -32611,5 +32707,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr ""
@@ -32666,7 +32762,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "militär"
@@ -32680,5 +32776,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "begravningsplats"
@@ -32691,5 +32787,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "topp"
@@ -32704,5 +32800,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "glaciär"
@@ -32716,5 +32812,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "vulkan"
@@ -32769,8 +32865,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "naturfenomen"
@@ -32784,5 +32880,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "buskage"
@@ -32796,5 +32892,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "hed"
@@ -32808,5 +32904,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -32820,5 +32916,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "lera"
@@ -32832,5 +32928,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "strand"
@@ -32908,8 +33004,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "rutt"
@@ -32998,12 +33094,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "gräns"
@@ -33153,11 +33249,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "plats"
@@ -33171,5 +33267,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33525,6 +33621,11 @@
 msgstr ""
 
-#~ msgid "closedway"
-#~ msgstr "slutenväg"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Den valda sträckan innehåller inte den valda noden."
+#~ msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Grader Minuter Sekunder"
 
 #~ msgid "Move"
@@ -33783,12 +33884,6 @@
 #~ "JOSM från."
 
-#~ msgid "Do not show again"
-#~ msgstr "Visa inte igen"
-
 #~ msgid "All images"
 #~ msgstr "Alla bilder"
-
-#~ msgid "Boat"
-#~ msgstr "Båt"
 
 #~ msgid "Motorboat"
@@ -34352,4 +34447,7 @@
 #~ "Rapportera in detta som ett fel."
 
+#~ msgid "closedway"
+#~ msgstr "slutenväg"
+
 #~ msgid "Login"
 #~ msgstr "Logga in"
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 22568)
+++ applications/editors/josm/i18n/po/tr.po	(revision 22569)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-11 19:43+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 13:26+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-07-28 09:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,5 +25,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -54,14 +54,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -78,9 +77,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -125,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -163,5 +162,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -229,5 +228,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -243,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -261,11 +260,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -273,20 +273,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -319,5 +319,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Birleştir"
@@ -385,5 +385,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -397,5 +397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -417,4 +417,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -431,6 +432,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -442,5 +443,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -575,22 +576,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Yolları Birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Çeşitli yolları birine birleştir."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Yönü değiştirilsin mi?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Yönü değiştirip birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -600,5 +601,5 @@
 "değiştirmek istermisiniz?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -606,10 +607,10 @@
 msgstr "Yollar birleştiriledi (Tek bir yoluna konulamadı)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} yol birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Lütfen birleştirmek için en az iki yol seçiniz."
@@ -656,10 +657,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -797,5 +798,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -861,10 +862,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "GPX olarak kaydet..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Veri GPX dosyası olarak kaydet."
@@ -1054,5 +1055,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1464,20 +1465,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1501,5 +1502,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1510,6 +1511,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Hata"
@@ -1536,5 +1537,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1542,5 +1543,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Şimdiki bilgiyi kaydet."
@@ -1595,10 +1596,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Varolan bilgileri yeni bir dosyaya kaydet."
@@ -1643,5 +1644,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1668,5 +1669,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr ""
@@ -1734,23 +1735,29 @@
 msgstr[0] "Yolu Basitleştir ({0} nokta kaldır)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Yolları Böl"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Seçili kavşakta yolu böl."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Yapılan seçim bölme için kullanılamaz."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "seçili kavşaklar aynı yolu paylaşmıyorlar."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "Seçili kavşak herhangi bir yolun ortasında değil."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1762,19 +1769,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "seçili kavşaklar aynı yolu paylaşmıyorlar."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Seçili yol seçili kavşakları içermiyor."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Dairesel bir yolu bölmek için iki veya fazla kavşak seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1783,5 +1781,5 @@
 "Yol seçili kavşaktan bölünemez. (İpucu: Yolun ortasından kavşak seçiniz)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1789,5 +1787,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1795,5 +1793,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1943,5 +1941,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2912,22 +2910,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3068,25 +3066,25 @@
 msgstr "Karar verilemeyen çakışma çözülemiyor."
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Yolu sil {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "İlişkiyi sil {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3095,5 +3093,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3102,5 +3100,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3109,5 +3107,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3116,5 +3114,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3266,5 +3264,5 @@
 msgstr "Uygula?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3339,17 +3337,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Klasörden dosya alınmasında hata oluştu {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Kananoik yol klasör için bulunamadı {0}\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Hafıza alanı oluşturulamadı(cache): {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3519,42 +3517,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Derece Dakika Saniye"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr ""
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "G"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "K"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "B"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "D"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3562,5 +3563,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3726,5 +3727,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "arkaplan"
@@ -3868,5 +3869,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr ""
@@ -3894,5 +3895,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "demiryolu"
@@ -3914,6 +3915,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -3981,5 +3982,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "yapılar"
@@ -4065,5 +4066,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4165,69 +4166,69 @@
 msgstr "şifre"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "kullanım"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "seçenekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Bu Yardımı Göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standart unix geometry argümanı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Kutu ile belirlenen sınırları indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Linkteki bilgiyi indir (lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Kutu ile belirlenen alanı ham gps olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Yapılan aramaya göre seçim yap"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Tercihleri varsayılan değerlere getir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4237,9 +4238,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "örnekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4247,46 +4248,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Ayarlar Okunuyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Eski eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Varsayılan ayarlar alınıyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Arayüz Oluşturuluyor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Çözümle"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4295,5 +4295,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4389,33 +4389,33 @@
 msgstr "Dışarı Zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "ölçek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Fare imleci üzerindeki coğrafi boylam."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Fare imleci üzerindeki objenin adı."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Fare imleci üzerindeki coğrafi enlem."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Önceki ve şimdiki yol kısımları arasındaki açı."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Segment çizildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Yeni yol segmentinin uzunluğu çizildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4423,9 +4423,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(obje yok)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4441,4 +4441,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Servis"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "çinli"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Ticari"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5146,5 +5161,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "hepsi"
@@ -5227,6 +5242,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5236,5 +5251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5362,5 +5377,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr ""
@@ -5421,5 +5436,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5578,5 +5593,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5584,5 +5599,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5590,5 +5605,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5596,5 +5611,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5602,5 +5617,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5609,5 +5624,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5615,5 +5630,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5621,5 +5636,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5627,24 +5642,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
@@ -5724,51 +5739,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Tabakalar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Yüklenilmiş olan tabakaların listesini göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Seçili tabakanın görünen kısmını sabitle."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Göster/Sakla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Seçili tabakanın görünen kısmını sabitle."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Seçili tabakayı bir satır yukarı taşı."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Seçili tabakayı bir satır aşağı taşı."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr ""
@@ -5778,5 +5793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "İlişkiler"
@@ -6929,6 +6944,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6976,107 +6992,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "İsim"
@@ -7414,5 +7430,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7499,5 +7515,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<farklı>"
@@ -8222,5 +8238,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr ""
@@ -8293,8 +8309,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Tip"
@@ -8323,6 +8339,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "bilinmeyen"
@@ -8643,5 +8659,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr ""
@@ -8700,14 +8716,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Yaptığınız yükleme için kısa bir bilgi yazınız:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Yorumunu Ekle"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr ""
@@ -9138,5 +9155,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr ""
@@ -9158,5 +9175,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9164,60 +9181,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+msgid "Please revise upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "Reset"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Devam et"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+msgid "Cancel and return to the previous dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Tekrar Gösterme"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9537,103 +9586,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "gps noktası"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Çizimi özelleştir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Genel ayarları kullan."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Bu tabaka için çizgiler arasını birleştir."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Bu tabaka için çizgileri birleştirme."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Çizim seçeneklerini seçiniz"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Renkleri Ayarla"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Varsayılan"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Renk seç"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "işaretli noktalardan imleçler"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "{0} isim verilen izler"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Sesi içeri al"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio files (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "{0} daki ses imleçleri"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Görüntüleri içeri al"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9641,5 +9598,5 @@
 msgstr "İsim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9647,5 +9604,5 @@
 msgstr "Tanım: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9655,23 +9612,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Uzunluk: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9679,5 +9636,5 @@
 msgstr[0] "{0} rut, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9685,10 +9642,10 @@
 msgstr[0] "{0} yol noktaları"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Bilgi tabakasına çevir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9698,21 +9655,21 @@
 "yüklemek isterseniz buraya bakınız:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Çevrildiği yer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9720,10 +9677,10 @@
 msgstr "OSM den bu izi indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Bunun içindeki herşeyi indir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9731,10 +9688,10 @@
 msgstr "{0} metre"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Her istek için max. alan:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9742,21 +9699,21 @@
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9768,9 +9725,9 @@
 "istiyor musunuz?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Tabakada ses ile ilişkilendirilecek GPX izi yok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9778,5 +9735,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9785,23 +9742,115 @@
 "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Çizimi özelleştir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Genel ayarları kullan."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Bu tabaka için çizgiler arasını birleştir."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Bu tabaka için çizgileri birleştirme."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Çizim seçeneklerini seçiniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Renkleri Ayarla"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Varsayılan"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Renk seç"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "işaretli noktalardan imleçler"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} isim verilen izler"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Sesi içeri al"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio files (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} daki ses imleçleri"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Görüntüleri içeri al"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "indirilen alanın dışında"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9810,11 +9859,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9823,36 +9872,36 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} şunları içerir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "GPX tabakasına çevir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9860,5 +9909,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9867,10 +9916,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
 msgstr[0] "nokta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -9878,5 +9927,5 @@
 msgstr[0] "{0} noktalı iz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -9884,5 +9933,5 @@
 msgstr[0] "{0} {1} izden oluşur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -9890,24 +9939,28 @@
 msgstr[0] "{0} nokta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "GPX e göre ilişkilendir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Dosyaları (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "{0} Dosyası \"{1}\" ismi ile yüklendi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Ayrıştırma sırasında hata {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Okunamadı \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9919,34 +9972,34 @@
 "seçiniz<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Fotoğraf zamanı (exif den):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Gps zamanı (fotoğraftan okundu): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [gg/aa/yyyy sa:dk:sn]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Şu zaman dilimindeyim: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Tarih Yok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Başka bir fotoğraf aç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "GPS receiver ile Fotoğrafın zamanını eşitle"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -9956,93 +10009,93 @@
 "Lütfen istenen formatı kullanın"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Geçersiz Tarih"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<GPX izi yüklenmedi>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX izi: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Başka GPX izi aç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Zamandilimi: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "imaj ile GPX izini ilişkilendir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Geçersiz zaman dilimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Geçersiz offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10052,20 +10105,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10074,5 +10127,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10080,21 +10133,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10102,17 +10155,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "GPX izi seçmelisiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "seçili GPX izi yok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10123,5 +10176,5 @@
 "İstenen format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10132,56 +10185,52 @@
 "İstenen format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "EXIF den GPS verisi çıkartılıyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "klasör arama başladı"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Fotoğraflar okunuyor..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "{0} Okunuyor..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kananoik yol klasör için bulunamadı {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Klasör aranıyor {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Klasörde null dosya bulundu {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Klasörden dosya alınmasında hata oluştu {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged Görüntüler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "GPX e göre ilişkilendir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10190,5 +10239,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10197,10 +10246,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10209,5 +10258,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10307,14 +10356,14 @@
 msgstr "JPEG görüntüsü (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps imleçi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
 msgstr[0] "imleç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10322,14 +10371,26 @@
 msgstr[0] "{0} {1} imleçten oluşur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "Sesi işaretleyecek herhangi bir nesne yok."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Görünen metin ve ikonları sabitle."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Sesi Eşle"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "Eşlemeye yardımcı bir ses duyduğunuzda, çalan sesi durdurunuz."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10337,30 +10398,18 @@
 msgstr "Ses {0} noktasında eşlendi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Çalan tabakada eşleme yapılamadı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Ses dosyasının başlangıcını işaretle"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr "Sesi işaretlemek istediğinizde çalan kaydı durdurmanız gerekir."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr "Sesi işaretleyecek herhangi bir nesne yok."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Görünen metin ve ikonları sabitle."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11208,4 +11257,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr ""
@@ -11220,5 +11270,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -11321,5 +11371,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Sadece ilginiç yön ipuçlar (ör:tek yön)."
@@ -11327,5 +11377,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Sadece yolun başında"
@@ -11355,5 +11405,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "yazar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Boat"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11362,9 +11426,9 @@
 "GPX dosyası açılınca otomatik olarak yol noktalarından imleç tabakası oluştur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11372,9 +11436,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11383,25 +11447,25 @@
 "''-1'' yap."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Maximum uzunluk (metre)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Gelen çizimde herhangi bilgi olmasa bile çizime zorla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPS noktalarını bağlayan yönler için okları çiz."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "Yön çizgi okları için tablo değerlerini kullan hesap yapma."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11409,13 +11473,13 @@
 msgstr "Son çizilen çizgiden sonra bu kadar boşluk varsa okları çizme"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Minimum uzaklık (pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "GPS noktaları için geniş nokta çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11423,9 +11487,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11433,46 +11497,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Farklı ortalama hızar için farklı renklerin kullanılmasına izin ver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "Yol noktaları görüntüsü"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS Noktaları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Yol segmentleri için yön ipuçları çiz."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Her segment için kendi yolu buyunca sıra numarası çiz."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Daha düzgün harita grafikleri için 'antialiasing' uygula  ."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Server'dan gelen bilginin sınırlarını çiz ."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Kolay yol düzenlemesi için sanal kavşaklar çiz."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Pasif tabakaları farklı renklerde çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM Data"
@@ -11828,21 +11901,26 @@
 msgstr "Ayarların aktif olamsı için programı açıp/kapatmalısınız."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Projeksiyon türü"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "koordinatları şu şekilde göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Projeksiyon türü"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Ölçüm tabakası"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Harita Projeksiyonu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12385,5 +12463,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12392,49 +12470,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr ""
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Seçilebilen Özellikler:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12444,15 +12522,15 @@
 msgstr "Etiketteki özellikler okunamadı: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "İşleme Hatası {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12461,17 +12539,17 @@
 msgstr[0] "{0} Objeyi Değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12489,7 +12567,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Arama"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12498,17 +12575,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Objeleri ara."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Seçime yakınlaş"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Objeleri ara."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12807,5 +12881,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı."
@@ -14246,5 +14320,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14513,5 +14587,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Adres İnterpolasyon"
@@ -14853,41 +14927,41 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -14904,25 +14978,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -14960,18 +15034,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Binalar"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15195,8 +15269,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "su"
@@ -15257,6 +15331,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "adres"
@@ -15722,34 +15796,34 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Boş Tabaka"
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
-#, java-format
-msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
-#, java-format
-msgid "Raster size: {0}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15758,14 +15832,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr ""
 
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr ""
+
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
-#, java-format
-msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -15842,22 +15916,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Nesneyi indir..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "OSM den bu izi indir"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Alanı indir"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "Lütfen en az bir indirme görevi seçiniz"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -15872,7 +15942,7 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Ayrıştırmada hata {0}: {1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -15903,9 +15973,9 @@
 msgstr "Çiftli yol oluştur"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15915,5 +15985,5 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr ""
@@ -15922,11 +15992,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Yolu GPX tabakasından içeri al"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Var olan yolu iptal et"
@@ -15936,5 +16006,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "GPX veri tabaksı bulunamadı."
@@ -15944,13 +16014,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16191,5 +16261,5 @@
 msgstr "Gotag yapılmamış görüntüleri göster"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "İçeri alınan görüntüler"
@@ -16547,8 +16617,6 @@
 msgstr "ölçümler penceresini aç."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Reset"
@@ -16579,5 +16647,5 @@
 msgstr "Seçili iki kavşak arası açı"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Ölçüm tabakası"
@@ -16669,5 +16737,5 @@
 msgstr "OpenStreet Hata indirme döngüsü"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreet hatalarını göster"
@@ -16733,13 +16801,13 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -16853,93 +16921,93 @@
 msgstr "Firefox exe"
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr ""
+
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
-msgid "Read error!"
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
 msgid "Write error!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr ""
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
-msgstr ""
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
 msgstr ""
 
@@ -16981,9 +17049,9 @@
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr ""
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr ""
@@ -17161,20 +17229,24 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "read protocol version"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "Uzak kontol hareketlerini, manual kontrol et"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "JOSM un diğer uygulamalar tarafında kontrol edilmesini sağlayan API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Uzak Kontrol"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Uzak kontrol eklenti ayarları."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17185,50 +17257,58 @@
 "uygulamaların eklenti ile haberleşmesi için kullanılır."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Onaylanan Hareket"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "API tarafından uzaktan kontrol veri yüklemesi soruldu."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "İstek Detayı: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Buna izin veriyormusunuz?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "uzak kontrol haereketini onayla"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Şu linkten uzak kontrolle veri alınmak istenildi.Link:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17236,5 +17316,5 @@
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Değiştir"
@@ -17433,41 +17513,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Hareketli Harita"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Mozaik Yükle"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Bütün Mozaikleri Yükle"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr ""
@@ -17767,4 +17847,14 @@
 msgid "Terrace"
 msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Ayıraç"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18451,6 +18541,6 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18460,9 +18550,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr ""
@@ -18541,6 +18631,6 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18548,5 +18638,5 @@
 msgstr "Onaylama Hataları"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Onaylama hatası yok"
@@ -18785,32 +18875,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Çift Noktalar"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Çift Noktalar"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Çift Noktalar"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Çift Noktalar"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Çift Noktalar"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Çift Noktalar"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -18847,5 +18931,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr ""
@@ -19370,5 +19454,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "alan"
@@ -19506,10 +19590,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr ""
@@ -19655,10 +19739,10 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -19844,28 +19928,24 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Otomatik indir"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, 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:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, 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:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -19876,17 +19956,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Görünen mozaikleri indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -19895,48 +19975,52 @@
 "değiştirin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Çözünürlüğü değiştir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "WMS tabakasını dosyaya kaydet"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "WMS tabakasını dosyadan yükle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, 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:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Dosya Format Hatası"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Dosya Yüklemede Sorun"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Otomatik indir"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20015,5 +20099,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20050,5 +20134,5 @@
 msgstr ""
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20069,5 +20153,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "orman"
@@ -20086,22 +20170,19 @@
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "sınırlar"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "ölçümler"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "Suboru Hattı"
+msgstr ""
 
 #. relation type
@@ -20113,43 +20194,37 @@
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Sanatsal"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "toplu_taşıma_hatları"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "varış"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "rut"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "Yapıştır"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "suyolu"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20423,7 +20498,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "OSM den bu izi indir"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -20620,6 +20694,11 @@
 msgstr ""
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -20628,5 +20707,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -20635,5 +20714,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -20642,10 +20721,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -20654,5 +20733,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -20662,5 +20741,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20669,15 +20748,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20686,5 +20765,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -20817,5 +20896,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Referans"
@@ -21354,5 +21433,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr ""
@@ -21365,5 +21444,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "orman"
@@ -21667,9 +21746,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "Evet"
@@ -21779,9 +21858,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "hayır"
@@ -22040,5 +22119,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "yerleşim_alanı"
@@ -22087,5 +22166,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "servis"
@@ -22120,5 +22199,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "inşaat"
@@ -22205,5 +22284,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr ""
@@ -22238,5 +22317,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr ""
@@ -22406,14 +22485,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Operator"
@@ -22681,6 +22760,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "yükseklik"
@@ -23128,5 +23207,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "batak"
@@ -23532,5 +23611,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Voltaj"
@@ -23894,31 +23973,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Açılış saati"
@@ -23978,90 +24057,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -24174,7 +24253,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Referans Numarası"
@@ -24190,5 +24269,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "yer altı"
@@ -24201,6 +24280,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Ücret"
@@ -24376,5 +24455,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "tekerlekli sandalye"
@@ -24411,6 +24490,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Sığınak"
@@ -24418,5 +24497,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "banket"
@@ -24535,5 +24614,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Fener"
@@ -24694,5 +24773,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "lokanta"
@@ -24700,73 +24779,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "italyan"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "çinli"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "yunan"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "alman"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "hint"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "yöresel"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "türk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "asyalı"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -24774,17 +24858,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast Food düzenle"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Kafe"
@@ -24792,9 +24876,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Cafe düzenle"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Pub"
@@ -24802,18 +24886,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Pub Düzenle"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Biergarten Düzenle"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr ""
@@ -24821,9 +24906,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "GeceKlubu"
@@ -24831,24 +24916,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "GeceKulubu Düzenle"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Turizm"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "İlginç Yerler"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "İlginç Yerler Düzenle"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Müse"
@@ -24856,9 +24941,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Müze Düzenle"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Hayvanat Bahçesi"
@@ -24867,9 +24952,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Hayvanat Bahçesi Düzenle"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Seyir Yeri"
@@ -24877,24 +24962,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Seyir Yeri Düzenle"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Seyir Kulesi"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Lunapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Lunapark Düzenle"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Sanatsal"
@@ -24902,5 +24987,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Sanatsal Düzenle"
@@ -24908,19 +24993,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Harita"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -24958,5 +25043,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24964,28 +25049,28 @@
 msgstr "sokak"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -24995,5 +25080,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -25001,5 +25086,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "gezme"
@@ -25007,6 +25092,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Bisiklet"
@@ -25014,5 +25099,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -25020,6 +25105,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Kayak"
@@ -25027,5 +25112,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -25033,46 +25118,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "tarih"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "doğa"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "vahşiyaşam"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25080,29 +25172,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Sığınak Düzenle"
@@ -25110,25 +25202,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Mangal Alanı"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Piknik Alanı"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Piknik Alanı Düzenle"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Tarihi Alanlar"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "Kale"
@@ -25137,19 +25229,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Kale Düzenle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Harabe"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Harabe Düzenle"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Arkeolojik Site"
@@ -25158,9 +25250,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Arkeolojik Site Düzenle"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Savaş Alanı"
@@ -25168,10 +25260,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Savaş Alanı Düzenle"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25179,5 +25271,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25185,15 +25277,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Anıt"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Anıt Düzenle"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Abide"
@@ -25201,55 +25293,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Abide Düzenle"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Yol Kenar Geçişi"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Yol Kenar Geçişi Düzenle"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri Düzenle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Dinlenme Alanı"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Su Parkı"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Su Parkı Düzenle"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Oyun Sahası"
@@ -25257,35 +25349,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Oyun Sahası Düzenle"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Balıkçılık"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Balıkçılık Düzenle"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Spor Aktivite"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Stadyum"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Stadyum Düzenle"
@@ -25299,6 +25391,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "Spor Seç"
@@ -25714,31 +25806,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "spor"
@@ -25748,240 +25840,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "çoğul"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "okçuluk"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "avustralya_footbol"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "basebol"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "basketbol"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "bowling"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "çimen bowling"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "tırmanma"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "bisiklet"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "köpek yarışı"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "at binicilik"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "jimnastik"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "hokey"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "at_yarışı"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "raket"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "kaykay"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "paten"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "kaymak"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "futbol"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "yüzmek"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "masa_tenisi"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "spor merkezi"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "spor merkezi düzenle"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "atıcılık"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "atıcılık düzenle"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "yarış pisti"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "yarış pisti düzenle"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Golf Alanı"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Golf Alanı Düzenle"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Minyatür Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Minyatür Golf Düzenle"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Spor"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Çoğul"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Çoğul Düzenle"
@@ -26023,23 +26115,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "tip"
@@ -26081,211 +26173,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "spor_merkezi"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "stadyum"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "10pin Düzenle"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Atletik Düzenle"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "okçuluk"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "okçuluk düzenle"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "tırmanma"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "tırmanma düzenle"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Kano Düzenle"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Bisiklet Düzenle"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Köpek Yarışı"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Köpek Yarışı Düzenle"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "binicilik"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "binicilik düzenle"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "At Yarışı"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "At Yarışı Düzenle"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "jimnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "jimnastik düzenle"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Motor Sporlar"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Motor Sporları Düzenle"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "patinaj"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "patinaj düzenle"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "kaykay"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "kaykay düzenle"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "yüzme"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "yüzme düzenle"
@@ -26293,52 +26385,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Kayak Düzenle"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Atıcılık"
@@ -26346,204 +26438,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Atıcılık Düzenle"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Spor (Topla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Futbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Futbol Düzenle"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Avustralyan Futbol"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Avustralyan Futbol Düzenle"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Baseball Düzenle"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Basketbol"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Basketbol Düzenle"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Golf Düzenle"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "golf_alanı"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Boule Düzenle"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Bowling Düzenle"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Kricket Düzenle"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Cricket Nets Düzenle"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Kroke"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "kroke Düzelt"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Hockey Düzenle"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Pelota Düzenle"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Raket"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Raket Düzenle"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Masa Tenisi"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Masa Tenisi Düzenle"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Tennis Düzenle"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Bina"
@@ -26551,5 +26643,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Kamu Binası"
@@ -26557,10 +26649,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Kamu Binası Düzenle"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "belediye binası"
@@ -26568,10 +26660,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "belediye binası düzenle"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Büyükelçilik"
@@ -26579,10 +26671,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Büyükelçilik Düzenle"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "adliye sarayı"
@@ -26591,10 +26683,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "adliye sarayı düzenle"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "Hapishane"
@@ -26603,10 +26695,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Hapishane Düzenle"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Polis"
@@ -26616,10 +26708,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Polis Düzenle"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "İtfaye İstasyonu"
@@ -26628,10 +26720,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "İtfaye İstasyonu Düzenle"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Postane"
@@ -26639,5 +26731,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Postane Düzenle"
@@ -26645,15 +26737,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Anaokul"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Anaokul Düzenle"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Okul"
@@ -26661,10 +26753,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "okul düzenle"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Universite"
@@ -26672,10 +26764,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Universite Düzenle"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "kolej"
@@ -26683,5 +26775,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "kolej düzenle"
@@ -26689,5 +26781,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Sinema"
@@ -26696,10 +26788,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Sinema Düzenle"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "kütüphane"
@@ -26708,9 +26800,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "kütüphane düzenle"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "sanat merkezi"
@@ -26718,10 +26810,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "sanat merkezi düzenle"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Tiyatro"
@@ -26730,10 +26822,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Tiyatro Düzenle"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Tapınak"
@@ -26743,5 +26835,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Tapınak Düzenle"
@@ -26750,6 +26842,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Din"
@@ -26758,66 +26850,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "hristiyan"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "yahudi"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "müslüman"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "Zerdüştlük"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "mezhep"
@@ -26826,81 +26918,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "anglikan"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "katholik"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "protestan"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "yahova_şahitleri"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Adres"
@@ -26909,5 +27001,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Adres Bilgileri Düzenle"
@@ -26915,5 +27007,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Ev no:"
@@ -26921,25 +27013,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Ev İsmi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Sokak Adı"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Şehir Adı"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Posta Kodu"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Ülke Kodu"
@@ -26948,5 +27040,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Adres İnterpolasyon Düzenle"
@@ -26954,61 +27046,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Numara şeması"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "tek"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "çift"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "İnsan Yapımı"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Tesis"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Tesis Düzenle"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Kule"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Kule Düzenle"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr ""
@@ -27016,25 +27108,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Su Kulesi"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Su Kulesi Düzenle"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Gazdeposu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Gazdeposu Düzenle"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "DenizFeneri"
@@ -27042,10 +27134,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "DenizFeneri Düzenle"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Yeldeğerimeni"
@@ -27053,10 +27145,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Yeldeğerimeni Düzenle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Suboru Hattı"
@@ -27065,41 +27157,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Suboru hattı Düzenle"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "benzin"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Kanalizasyon Plant"
@@ -27109,10 +27201,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Kanalizasyon Plant Düzenle"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Vinç"
@@ -27120,5 +27212,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Vinç Düzenle"
@@ -27126,10 +27218,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Fener Düzenle"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Poligon Noktası"
@@ -27137,10 +27229,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Poligon Noktası Düzenle"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Gözetim"
@@ -27148,23 +27240,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Gözetim Kamera Düzenle"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Güç Jeneratorü"
@@ -27174,35 +27266,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Güç Jeneratorü Düzenle"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "rüzgar"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "hidro"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "nükleer"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "kömür"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "güneş enerjisi"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Güç İstasyonu"
@@ -27211,10 +27303,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Güç İstasyonu Düzenle"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Alt Güç İstasyonu"
@@ -27223,5 +27315,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Alt Güç İstasyonu Düzenle"
@@ -27229,10 +27321,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "çizgi referansı"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Güç Kulesi"
@@ -27243,23 +27335,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "güç Kulesi Düzenle"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Güç Hattı"
@@ -27268,78 +27360,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Güç Hattı Düzenle"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "Suboru Hattı"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "otoyol_hat"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "hoş mekan"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Tuvalet"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Not"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Posta Kutusu"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Telefon"
@@ -27348,5 +27438,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Telefon Düzenle"
@@ -27354,5 +27444,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Madeni Para"
@@ -27360,5 +27450,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Notlar"
@@ -27366,5 +27456,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronik cüzdan ve Para Değişim Kartları"
@@ -27372,5 +27462,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "ATM kartı"
@@ -27378,15 +27468,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Kredi Kartı"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Telefon kart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Geri Dönüşüm"
@@ -27395,5 +27485,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Geri Dönüşüm İstasyonu"
@@ -27401,35 +27491,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Piller"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Çöp Tenekesi"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Kıyafet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Cam"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Kağıt"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Hurda Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27437,5 +27527,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27444,31 +27534,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr ""
@@ -27547,39 +27637,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "yeşil"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Av Standı"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Av Standı Düzenle"
@@ -27588,30 +27678,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Yükseklik"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "alçak"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "yarım"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "tam"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Sakla"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Kilitle"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Kaynak"
@@ -27620,10 +27710,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Kaynak Düzenle"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "İçme Suyu"
@@ -27632,10 +27722,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "İçme Suyu Düzenle"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr ""
@@ -27644,5 +27734,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27650,5 +27740,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Bebek Yuvası"
@@ -27656,15 +27746,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Bebek Yuvası Düzenle"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Dükkanlar"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr ""
@@ -27672,10 +27762,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "araçlı alışveriş düzenle"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr ""
@@ -27684,28 +27774,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Bisiklet dükkanı düzenle"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Supermarket Düzenle"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Bakkal"
@@ -27713,9 +27803,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Bakkal Düzenle"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -27723,27 +27813,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Kiosk Düzenle"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "kasap"
@@ -27751,9 +27841,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "kasap düzenle"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "fırın"
@@ -27761,9 +27851,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "fırın düzenle"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr ""
@@ -27771,18 +27861,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr ""
@@ -27790,54 +27880,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr ""
@@ -27845,9 +27935,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr ""
@@ -27855,9 +27945,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "kendin-al-market"
@@ -27865,54 +27955,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "kendin-al-market düzenle"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "berber"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "berber düzenle"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Kuru Temizleme"
@@ -27920,9 +28010,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Kuru Temizleme Düzenle"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Çamaşırhane"
@@ -27930,9 +28020,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Çamaşırhane Düzenle"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Dışortam"
@@ -27940,24 +28030,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Dış ortam dükkanları düzenle"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Kahve Makinası"
@@ -27965,5 +28055,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Kahve Makinası Düzenle"
@@ -27971,97 +28061,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Ücretli Ürünler"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "toplu_taşıma_bileti"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "toplu_taşıma_hatları"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "Park_bileti"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "yiyecek"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "içecek"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "tatlı"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "sigara"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "fotoğraf"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "hayvan_besini"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "gazeteler"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "oyuncuklar"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "pullar"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-kart"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "telefon_kartı"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "bilet"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "kondom"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "tampon"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "dışkı_poşeti"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "hesap veya üyelik kartı"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Kasa"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Banka"
@@ -28069,14 +28159,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Banka düzenle"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Döviz Bürosu"
@@ -28084,5 +28174,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Döviz Bürosu Düzenle"
@@ -28090,15 +28180,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "ATM Düzenle"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Sağlık"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Doktor"
@@ -28106,18 +28196,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Doktor Düzenle"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Dişçi"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Dişçi Düzenle"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Eczane"
@@ -28125,5 +28215,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Eczane Düzenle"
@@ -28131,9 +28221,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "Dispenser"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Hastane"
@@ -28141,10 +28231,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Hastane Düzenle"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Acil Durum Noktası"
@@ -28153,5 +28243,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Acil Durum Noktası Düzenle"
@@ -28160,20 +28250,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Nokta Numarası"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Telefon Numarası"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Uluslararası kod kullanın, ör +90-212-67890)"
@@ -28181,5 +28271,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Veteriner"
@@ -28188,64 +28278,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Veteriner Düzenle"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Yerler"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Kıta"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Kıta Düzenle"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Ülke"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Ülke Düzenle"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "İl"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "İl Düzenle"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Bölge"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Bölge Düzenle"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "vilayet"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "vilayet Düzenle"
@@ -28253,15 +28343,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Şehir"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Şehir Düzenle"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Mahalle"
@@ -28269,10 +28359,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Mahalle Düzenle"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Banliyo"
@@ -28280,25 +28370,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Banliyo Düzenle"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Köy"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Köy Düzenle"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Mezra"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Mezra Düzenle"
@@ -28306,5 +28396,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Semt"
@@ -28312,10 +28402,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Semt Düzenle"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Ada"
@@ -28323,10 +28413,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Ada Düzenle"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -28334,5 +28424,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -28340,5 +28430,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Mağara Girişi"
@@ -28346,10 +28436,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Mağara Girişi Düzenle"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Zirve"
@@ -28357,10 +28447,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Zirve Düzenle"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Buzul"
@@ -28368,10 +28458,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Buzul Düzenle"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Volkan"
@@ -28379,70 +28469,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Volkan Düzenle"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Belediye Sınırı"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Milli"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Ülke Sınırı Düzenle"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "İdari"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "İdari Sınırları Düzenle"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Sivil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Sivil Sınırları Düzenle"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Politik Sınır Düzenle"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Milli Park Sınırı Düzenle"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Arazi Kullanımı"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Ağaç"
@@ -28451,15 +28541,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Ağaç Düzenle"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Botannik İsim"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Orman"
@@ -28468,5 +28558,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Orman Düzenle"
@@ -28474,17 +28564,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "Kozalaklı Orman"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "yaprak düken orman"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "karışık"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "orman"
@@ -28493,14 +28583,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "orman kullanımı düzenle"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "korunacak doğa alanı"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "korunacak doğa alanı düzenle"
@@ -28508,25 +28598,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Taşlık Alan"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Taşlık Alan Düzenle"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Çalılık"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Çalılık Düzenle"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Dağ Eteği"
@@ -28534,10 +28624,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Dağ Eteği Kullanımı"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Sağlıksız Ağaç"
@@ -28545,5 +28635,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Sağlıksız Ağaç Düzenle"
@@ -28551,5 +28641,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Çiftlik"
@@ -28558,45 +28648,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Çiftlik Kullanımı Düzenle"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Çiftlik Arazisi"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Çiftlik Arazisi Kullanımı Düzenle"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Bağ"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Bağ Kullanımı Düzenle"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Kiralık Tarım Alanı"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Kiralık Tarım Alanı Düzenle"
@@ -28604,25 +28694,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Bahçe"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Bahçe Düzenle"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Otlak"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Otlak Kullanım Düzenle"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Köy Yerleşimi"
@@ -28630,10 +28720,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Köy Yerleşimi Düzenle"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Genel"
@@ -28641,20 +28731,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Genel Düzenle"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Park Düzenle"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "oyun alanı"
@@ -28662,5 +28752,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "oyun alanı kullanımı düzenle"
@@ -28668,15 +28758,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Yerleşim Alanı"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Yerleşim Alanı Kullanımı Düzenle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Mezarlık"
@@ -28684,9 +28774,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Mezarlık Düzenle"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Mezarlık"
@@ -28694,39 +28784,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Mezarlık Kullanımı Düzenle"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Perakende"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Perakende Alan Kullanımı Düzenle"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Ticari"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Ticari Alan Kullanımı Düzenle"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Endüstriyel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Endüstriyel Alan Kullanımı Düzenle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Demiryolu alanı"
@@ -28734,15 +28824,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Demiryolu alanı kullanımı düzenle"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Askeri"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Askeri Alan Düzenle"
@@ -28750,50 +28840,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "İnşaat Alanı"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "İnşaat Alanı Düzenle"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Ağaçsız_Alan"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Ağaçsız_Alan Kullanımı Düzenle"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Yeşil Alan"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "yeşil Alan kullanımı düzenle"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Toprak Dolum"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Toprak Dolum Alanı Düzenle"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Taşocağı"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "taşocağı Düzenle"
@@ -28803,5 +28893,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr ""
@@ -28813,5 +28903,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr ""
@@ -28819,5 +28909,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr ""
@@ -28825,5 +28915,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -28834,5 +28924,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -28840,36 +28930,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -28877,5 +28967,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr ""
@@ -28884,5 +28974,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -28890,34 +28980,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr ""
@@ -28926,15 +29016,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr ""
@@ -28942,5 +29032,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr ""
@@ -28949,5 +29039,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr ""
@@ -28955,5 +29045,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr ""
@@ -29061,5 +29151,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29070,17 +29160,17 @@
 msgstr "bisiklet"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "otobüs"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29148,5 +29238,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29156,9 +29246,9 @@
 msgstr "ayak"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr ""
@@ -29172,10 +29262,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr ""
@@ -29183,31 +29273,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr ""
@@ -29216,30 +29306,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29466,5 +29556,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "kırılmış"
@@ -30117,4 +30207,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30218,11 +30316,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "insan yapımı"
@@ -30735,5 +30833,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "iskele"
@@ -30747,5 +30845,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "suhattı"
@@ -30889,13 +30987,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "dinlenme_yeri"
@@ -30909,5 +31007,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr ""
@@ -31003,10 +31101,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "dinlenme_yeri"
@@ -31108,10 +31206,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "tail_trafiği"
@@ -31549,24 +31647,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "eski_sokak_lambası"
@@ -31598,6 +31696,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "su_lambası"
@@ -31658,8 +31756,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "sağlık"
@@ -32012,26 +32110,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "alışveriş"
@@ -32103,8 +32201,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "hotel"
@@ -32205,9 +32303,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "turizm"
@@ -32295,9 +32393,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "tarihi"
@@ -32310,5 +32408,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "taş_ocağı"
@@ -32322,5 +32420,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "toprak_doldurma"
@@ -32342,5 +32440,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "havza"
@@ -32354,5 +32452,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "çiftlik"
@@ -32375,5 +32473,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "perakende"
@@ -32387,5 +32485,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "endüstri"
@@ -32399,5 +32497,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "ağaçsız_alan"
@@ -32411,5 +32509,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "yeşil_alan"
@@ -32423,5 +32521,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "demiryolu"
@@ -32478,7 +32576,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "askeri"
@@ -32492,5 +32590,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "mezarlık"
@@ -32503,5 +32601,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "zirve"
@@ -32516,5 +32614,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "buzul"
@@ -32528,5 +32626,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "volkanik"
@@ -32581,8 +32679,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "doğal"
@@ -32596,5 +32694,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "çalılık"
@@ -32608,5 +32706,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "çalılık"
@@ -32620,5 +32718,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr ""
@@ -32632,5 +32730,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "çamur"
@@ -32644,5 +32742,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "sahil"
@@ -32720,8 +32818,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "rut"
@@ -32810,12 +32908,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "sınırlar"
@@ -32965,11 +33063,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "yer"
@@ -32983,5 +33081,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33337,6 +33435,10 @@
 msgstr "Sicilya - İtalya"
 
-#~ msgid "Do not show again"
-#~ msgstr "Tekrar Gösterme"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Seçili yol seçili kavşakları içermiyor."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Derece Dakika Saniye"
 
 #~ msgid ""
@@ -33982,7 +34084,4 @@
 #~ msgstr "Motorboat"
 
-#~ msgid "Boat"
-#~ msgstr "Boat"
-
 #~ msgid "Bridleway"
 #~ msgstr "At yolu"
Index: applications/editors/josm/i18n/po/uk.po
===================================================================
--- applications/editors/josm/i18n/po/uk.po	(revision 22568)
+++ applications/editors/josm/i18n/po/uk.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-22 06:56+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-29 14:54+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\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-07-28 09:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -24,5 +24,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -53,14 +53,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -77,9 +76,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -122,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -160,5 +159,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -234,5 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -248,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -266,11 +265,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -278,20 +278,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -326,5 +326,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "Об’єднати"
@@ -394,5 +394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -406,5 +406,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -426,4 +426,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -440,6 +441,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -451,5 +452,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -584,22 +585,22 @@
 msgstr "Завантаження відкритих наборів змін…"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "Приєднати лінію"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "З’єднати кілька ліній в одну"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "Змінити напрямки?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "Змінити напрямок на протилежний і з’єднати"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -609,5 +610,5 @@
 "напрямок однієї з них на протилежний?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -615,10 +616,10 @@
 msgstr "Не вдалося з’єднати лінії (Неможливо створити єдиний ланцюг з вузлів)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "З’єднати лінії — {0} шт."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "Будь ласка, виберіть принаймні дві лінії для з’єднання"
@@ -664,10 +665,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -807,5 +808,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -871,10 +872,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "Експортувати до GPX…"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "Експортувати дані до GPX файлу."
@@ -1068,5 +1069,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1512,20 +1513,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1549,5 +1550,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1558,6 +1559,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "Помилка"
@@ -1584,5 +1585,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1590,5 +1591,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "Зберегти поточні дані."
@@ -1645,10 +1646,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "Зберегти як…"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "Зберегти поточні дані в новий файл."
@@ -1695,5 +1696,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1720,5 +1721,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "Ні, скасувати"
@@ -1791,18 +1792,24 @@
 msgstr[2] "Спростити лінію (вилучити {0} точок)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "Розділити лінію"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "Розділити лінію у виділеній точці"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "Поточне виділення неможливо розділити."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "Виділені точки не є частиною однієї лінії."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1811,5 +1818,5 @@
 msgstr[2] "Виділені точки не знаходиться в середині будь-якої лінії."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1828,21 +1835,10 @@
 "виділіть також лінію."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "Виділені точки не є частиною однієї лінії."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "Виділена лінія не містить виділену точку."
-msgstr[1] "Виділена лінія не містить виділених точок"
-msgstr[2] "Виділена лінія не містить всіх виділених точок"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Щоб розділити замкнену лінію, виділіть не менше двох точок."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1852,5 +1848,5 @@
 "лінії)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1861,5 +1857,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1869,5 +1865,5 @@
 "потрібно перевірити та виправити за потреби.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -2021,5 +2017,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -3069,22 +3065,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3230,25 +3226,25 @@
 msgstr "Неможливо розв’язати невирішуваний конфлікт"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr "Потрібно вилучити, принаймні, один об’єкт, отримано порожній набір"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "Вилучити точку {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "Вилучити лінію {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "Вилучити зв’язок {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3258,5 +3254,5 @@
 msgstr[2] "Вилучити {0} об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3266,5 +3262,5 @@
 msgstr[2] "Вилучити {0} точок"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3274,5 +3270,5 @@
 msgstr[2] "Вилучити {0} ліній"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3282,5 +3278,5 @@
 msgstr[2] "Вилучити {0} зв’язків"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3442,5 +3438,5 @@
 msgstr "Застосувати?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3507,25 +3503,27 @@
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
-msgstr ""
+msgstr "Не можливо створити теку {0}, автозбереження буде відключене"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
-msgstr ""
+msgstr "Не можливо створити файл {0}, буде використане інше ім’я для файлу"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "Помилка читання файлів з каталогу {0}\n"
+msgstr ""
+"Помилка вводу-виводу під час створення файлу, автозбереження буде пропущене: "
+"{0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "Замінити старі резервні копії?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "Помилка створення каталогу для кешу: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3721,42 +3719,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Градуси у Хвилинах Секундах"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "Прогнозовані Координати"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "Пд"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "Пн"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "Зх"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "Сх"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3764,5 +3765,5 @@
 msgstr "Неможливо додати елемент {0} до набору даних, так як він вже присутній"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3943,5 +3944,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "тло"
@@ -4087,5 +4088,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "Не показувати знову (запам’ятати вибір)"
@@ -4113,5 +4114,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "залізниця"
@@ -4133,6 +4134,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -4202,5 +4203,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "будівля"
@@ -4288,5 +4289,5 @@
 msgstr "Об’єкт вилучено"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4389,30 +4390,30 @@
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "використання"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Показати цю довідку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Стандартний аргумент геометрії unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Завантажити ділянку в межах габаритного прямокутника"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 "Завантажити місцевість за посиланням (з параметрами lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4420,9 +4421,9 @@
 "Файл/Відкрити)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Завантажити ділянку в межах габаритного прямокутника, як дані GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4430,33 +4431,33 @@
 "дані GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Вибір з урахуванням пошуку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Запуск у розгорнутому вигляді"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Відновити типові налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Встановити мову"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "системні налаштування Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "ШЛЯХ/ДО/ПАПКИ/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Зміна папки для всіх налаштувань користувача"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4470,9 +4471,9 @@
 "виділеної пам’яті"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "приклади"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4482,5 +4483,5 @@
 "порядку."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
@@ -4488,42 +4489,41 @@
 "selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Ініціалізація"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Оновлення втулків…"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Встановлення оновлених втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Завантаження ранніх втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Типові налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Створення головного вікна"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Завантаження втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "Розв’язано"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr "Відновити"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4532,5 +4532,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4628,33 +4628,33 @@
 msgstr "Віддалити"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Географічна довгота під вказівником миші"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "Назва об’єкту під вказівником миші"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Географічна широта під вказівником миші"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "Кут між попереднім і поточним відрізком лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Подорожній кут створюваного відрізку лінії"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "Довжина створюваного відрізку лінії"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4664,9 +4664,9 @@
 "<br> Утримуйте CTRL, щоб вибрати мишею, безпосередньо зі списку.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(Немає об’єкта)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4682,4 +4682,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Шар ''{0}'' повинен бути в списку шарів"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "Числовий"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "китайська"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "Діловий район"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5437,5 +5452,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "всі"
@@ -5519,6 +5534,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5530,5 +5545,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5675,5 +5690,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "Набори змін"
@@ -5734,5 +5749,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5900,5 +5915,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5906,5 +5921,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5912,5 +5927,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5918,5 +5933,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5924,5 +5939,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5931,5 +5946,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5937,5 +5952,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5943,5 +5958,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5949,24 +5964,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "З"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>Фільтр активний</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> об’єктів приховано"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> об’єктів пошкоджено"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>Закрити діалог фільтра, щоб побачити всі об’єкти.<p></html>"
@@ -6046,51 +6061,51 @@
 msgstr "Закрити діалог, не створюючи нову точку"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "Шари"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "Відкрити список всіх завантажених шарів."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "Вилучити вибрані шари."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "Показати/приховати виділений шар."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "Показати/сховати"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "Показати/приховати виділений шар."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "Активувати"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "Активувати вибраний шар"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "Об’єднати цей шар з іншим шаром"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "Дублювати шар"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "Перемістити вибраний шар на один рядок вгору."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "Перемістити вибраний шар на один рядок вниз."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "Інформація про шар"
@@ -6100,5 +6115,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "Зв’язки"
@@ -7268,6 +7283,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7315,107 +7331,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "Назва"
@@ -7793,5 +7809,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7882,5 +7898,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<інший>"
@@ -8660,5 +8676,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "Межі"
@@ -8731,8 +8747,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "Тип"
@@ -8761,6 +8777,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "Невідомо"
@@ -9116,5 +9132,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "Виявлено конфлікт"
@@ -9187,14 +9203,15 @@
 "Попередження: помилка в заголовку \"{0}\" не відповідає очікуваному шаблону"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Напишіть короткий пояснення для змін, які ви завантажуєте:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Введіть коментар для даних, що надсилаються на сервер (мін. 3 знаки)"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "Невірний коментар для надсилання на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "Набір змін:"
@@ -9683,5 +9700,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "Надіслати"
@@ -9703,5 +9720,5 @@
 msgstr "Ініціалізація зв’язків для оновлення…"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9709,63 +9726,95 @@
 msgstr "Параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "Вирішіть, як завантажувати дані та які використовувати набори змін"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "Теґи нового набору змін"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Застосувати теґи до набору змін, який надіслано на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr ""
 "Керування відкритими наборами змін та вибір наборів для надсилання на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "Налаштування додаткових параметрів"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "Надіслати до ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "Надіслати зміни"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "Надіслати на сервер змінені елементи"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-"Будь ласка, введіть коментар для надсилання на сервер цього набору змін "
-"(мін. 3 символи)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "Невірний коментар для надсилання на сервер"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "У зворотному порядку"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "Далі"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "Скасувати і повернутися у редактор"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Більше не показувати"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "Будь ласка, спочатку введіть вірний розмір порції"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "Невірний розмір порції"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "Відмінити надсилання даний та повернутись до редагування"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -10145,108 +10194,11 @@
 msgstr[2] "Вилучити {0} об’єктів:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "точка GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "Налаштувати креслення ліній"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "Використовувати загальні налаштування"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "Креслити лінії між точками цього шару."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "Не креслити лінії між точками цього шару."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "Вибрати варіанти креслення ліній"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "Налаштувати колір"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Типовий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Вибрати колір"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "Позначки з іменованих точок"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Іменовані точки треку з {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "Імпортувати аудіо"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як точки не "
-"містять міток часу, ми не можемо синхронізувати їх з аудіо-даними.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "Імпорт неможливий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Аудіофайли Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Аудіо позначки з {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "Імпорт зображень"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html><html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як "
-"точки не містять міток часу, ми не можемо синхронізувати їх з зображеннями.</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -10254,5 +10206,5 @@
 msgstr "Назва: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -10260,5 +10212,5 @@
 msgstr "Опис: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -10269,23 +10221,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "Опис"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "Період"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "Довжина"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "Довжина: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -10295,5 +10247,5 @@
 msgstr[2] "{0} маршрутів, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -10303,10 +10255,10 @@
 msgstr[2] "{0} точок маршруту"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Перетворити в шар даних"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10316,21 +10268,21 @@
 "вважається шкідливим.<br>Якщо хочете завантажити треки, ознайомтеся з цим:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Перетворено з: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -10338,10 +10290,10 @@
 msgstr "Завантажити з OSM дані уздовж цього треку"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "Завантажити всі в межах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -10349,10 +10301,10 @@
 msgstr "{0} метрів"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "Максимальна ділянка для одного запиту:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -10360,21 +10312,21 @@
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr "Завантажити біля:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr "тільки треки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr "тільки дорожні точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr "треки та дорожні точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -10386,9 +10338,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На шарі відсутній трек GPX, щоб накласти звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -10398,5 +10350,5 @@
 "пропущені або перенесені на початок треку."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -10406,23 +10358,120 @@
 "розрахунку часу."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "Налаштувати креслення ліній"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "Використовувати загальні налаштування"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "Креслити лінії між точками цього шару."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "Не креслити лінії між точками цього шару."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "Вибрати варіанти креслення ліній"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "Налаштувати колір"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Типовий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Вибрати колір"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "Позначки з іменованих точок"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Іменовані точки треку з {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "Імпортувати аудіо"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як точки не "
+"містять міток часу, ми не можемо синхронізувати їх з аудіо-даними.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "Імпорт неможливий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Аудіофайли Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Аудіо позначки з {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "Імпорт зображень"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html><html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як "
+"точки не містять міток часу, ми не можемо синхронізувати їх з зображеннями.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Шар даних {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "по-за межами завантаженої ділянки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "версія {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Увага: спільне використання даних версій 0.6 і 0.5 у версії 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10432,11 +10481,11 @@
 msgstr[2] "Виявлено {0} конфліктів."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "Натисніть, щоб закрити цей діалог і продовжити редагування"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -10446,36 +10495,36 @@
 msgstr[2] "{0} вилучено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} складається з:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "відключено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "Версія API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "Перетворити в шар GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "Тест узгодженості набору даних"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "Проблем не виявлено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "Виявлені наступні проблеми:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -10486,5 +10535,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -10494,5 +10543,5 @@
 msgstr[2] "треків"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -10501,5 +10550,5 @@
 msgstr[2] "точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -10509,5 +10558,5 @@
 msgstr[2] "трек з {0} точками"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -10517,5 +10566,5 @@
 msgstr[2] "{0} складається з {1} треків"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10525,24 +10574,28 @@
 msgstr[2] "{0} точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "Відносяться до GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Файли GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Файл {0} завантажено під іменем \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Помилка синтаксичного аналізу {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Неможливо прочитати \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10554,34 +10607,34 @@
 "пояс<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "Час з фото (з exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Час GPS (зі знімку над фото): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [дд/мм/рррр гг:хх:сс]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "Я в часовому поясі: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "Без дати"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "Відкрити інше фото"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Синхронізуйте час з фото та GPS-приймача"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10591,21 +10644,21 @@
 "Будь ласка використовуйте формат запиту"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "Невірна дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<GPX-трек ще не заватажено>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "Трек GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "Відкрийте інший GPX-трек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10614,72 +10667,72 @@
 "екрану GPS-приймача</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "Авто-вгадування"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr "Перше фото припадає на першу точку gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "Ручне налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "Перевстановити позицію для: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "Зображення з координатами місця розташування в даних exif ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Зображення, які вже позначені ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "Показувати ескіз зображення на мапі"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "Часовий пояс: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "Зміщення:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "Зіставити зображення з GPX треком"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "Узгодити"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "Невірний часовий пояс"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "Невірне зміщення"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "Спробувати знову"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "Немає відповідних зображень!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "gpx не виділено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10690,20 +10743,20 @@
 msgstr[2] "<html><b>{0}</b> з <b>{1}</b> фото відповідає треку GPX.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часовий пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Хвилини: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунди: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10713,5 +10766,5 @@
 msgstr[2] "Розбіжність у часі {0} днів"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10721,21 +10774,21 @@
 "вручну зіставити фотографії за допомогою повзунків."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "Не вдалося зіставити фотографії з треком"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "Налаштування часового поясу і зсуву"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "Вибрані фотографії не містять інформацію про час."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "Фотографії не містять інформацію про час."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10745,17 +10798,17 @@
 "інший."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX Трек не має інформації про час"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "Ви повинні вибрати трек GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "Трек GPX не виділено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10766,5 +10819,5 @@
 "Очікуваний формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10775,56 +10828,52 @@
 "Очікуваний формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "Видобування координат GPS з EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "Запуск сканування каталогу"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "Один з виділених файлів порожній"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "Переглянути фотографії…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "Перегляд {0}…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Не вдалося отримати канонічний шлях до каталогу {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Сканування каталогу  {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Знайдено порожній файл в каталозі {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Помилка читання файлів з каталогу {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Зображення з геотеґами"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "Відносяться до GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10834,5 +10883,5 @@
 msgstr[2] "Завантажено {0} зображень."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10842,10 +10891,10 @@
 msgstr[2] "{0} знайдено, з GPS позначками."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Вилучити зображення з диску"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10856,5 +10905,5 @@
 "втрачено!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "Не можливо вилучити файл зображення"
@@ -10956,9 +11005,9 @@
 msgstr "Зображення JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "позначка GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10967,5 +11016,5 @@
 msgstr[2] "позначок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10975,9 +11024,22 @@
 msgstr[2] "{0} складається з {1} позначок"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"В цьому шарі відсутні аудіо-позначки від яких можливо зробити зрушення."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "Показати текст/значки"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Показати/приховати текст і значки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "Синхронізувати аудіо"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10986,5 +11048,5 @@
 "синхронізації."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10992,14 +11054,14 @@
 msgstr "Аудіо синхронізовано у точці {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "Не вдається синхронізувати в шарі, який програється."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "Встановити позначку аудіо на позиції програвання"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -11008,17 +11070,4 @@
 "Ви повинні поставити аудіо на паузу в тій точці шляху, де хочете поставити "
 "позначку."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr ""
-"В цьому шарі відсутні аудіо-позначки від яких можливо зробити зрушення."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr "Показати текст/значки"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Показати/приховати текст і значки."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11971,4 +12020,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "Нічого"
@@ -11983,5 +12033,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -12085,5 +12135,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -12093,5 +12143,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "Тільки на початку лінії."
@@ -12121,5 +12171,20 @@
 msgstr "Створювати мітки читаючи GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "Автор"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "Дизельне"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "Північ"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12129,9 +12194,9 @@
 "шару."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "Показувати лінії між точками GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12141,9 +12206,9 @@
 "щоб показувати всі лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "Максимальна довжина для локальних файлів (в метрах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12152,20 +12217,20 @@
 "показувати всі лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "Максимальна довжина (в метрах)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Показувати лінії, навіть якщо немає імпортованої інформації про лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Показувати стрілки на лініях, що з’єднують точки GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12174,5 +12239,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12181,13 +12246,13 @@
 "Не показувати стрілки, якщо вони знаходяться близько від попередніх стрілок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "Мінімальна відстань (в пікселях)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "Показувати точки GPS великими."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12197,9 +12262,9 @@
 "Менеджері Шарів."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "Позначати колір відрізків та точок треку в залежності від швидкості."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12209,37 +12274,46 @@
 "Ваш пристрій захоплення для цього повинен реєструвати таку інформацію."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Дозволяє настроювати забарвлення треку для різних середніх швидкостей."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "Забарвлення треку та точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "Опис точки шляху"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "Точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "Показувати напрямок на відрізках ліній."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показувати порядкові номери на всіх відрізках лінії."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Застосувати згладжування мапи."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Показувати межі ділянки, завантаженої з сервера."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12247,9 +12321,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "Показувати неактивні шари даних іншим кольором."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "Дані OSM"
@@ -12630,21 +12704,26 @@
 msgstr "Потрібно перезапустити JOSM, щоб зміни набрали сили."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "Тип проекції"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "Код проекції"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "Показувати координати як"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "Тип проекції"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "Код проекції"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "Шар для проведення вимірювань"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "Картографічна проекція"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -13252,5 +13331,5 @@
 msgstr "Додати новий теґ"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -13261,49 +13340,49 @@
 "повинна бути такою ж, як і у values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "Більш детальна інформація про цю функцію"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Невідомий запит: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "Доступні ролі"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr "роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr "кількість"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr "елементи"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "Необов’язкові атрибути:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Невідомий тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr "Роль елемента заготовки без батьків"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr "Вкладені елементи заготовок без батьків"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13313,15 +13392,15 @@
 msgstr "Неможливо прочитати з джерела заготовок теґів: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Помилка синтаксичного аналізу: {0} "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Елементи типу {0} підтримуються."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13332,17 +13411,17 @@
 msgstr[2] "Правка {0} об’єктів"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "Нічого не вибрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "Невдалий вибір!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "Застосувати заготовку"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13360,7 +13439,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "Пошук: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -13369,17 +13447,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "Пошук об’єктів"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "Показати локалізовані назви в переліку вибору"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "Пошук: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13701,5 +13776,5 @@
 msgstr "Невдалось розібрати файл ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Помилка розбору: неправильна структура документа GPX"
@@ -15319,5 +15394,5 @@
 "об’єкт.<br><br>Повідомлення про помилку:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15612,5 +15687,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr "Вставка адрес"
@@ -16044,41 +16119,41 @@
 msgstr "Більше не показувати"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "Адреса будівлі"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "Номер дома:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "Вулиця:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "Збільшення"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "Зменшення"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "Номери:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr "Режим великих будівель"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr "Повернути приціл"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr "Додаткові параметри"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr "Теґ будівлі:"
@@ -16095,25 +16170,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "Встановити розмір будівель"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "Використовувати діалог адрес"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr "Авто-вибір будівлі"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "Ширина будинків:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr "Довжина кроку:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr "Додатково…"
@@ -16151,18 +16226,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "Будівлі"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr "Наступний номер"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "Вулиця"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr "Ввести адреси"
@@ -16403,8 +16478,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "вода"
@@ -16465,6 +16540,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "адреса"
@@ -16969,34 +17044,34 @@
 "Виберіть спочатку один із них, а потім повторіть."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "Порожній шар"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Шар WMS ({0}), {1} квадрат(и,ів) завантажено"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "Не векторизований."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Розмір растру: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "Векторизований."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Габаритний прямокутник общини: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -17007,14 +17082,14 @@
 "Створіть новий."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Помилка формату кешу"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "Зона Lambert {0} в кеші не сумісна з поточною зоною Lambert {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 msgid "Cache Lambert Zone Error"
 msgstr "Помилка кешу зони Lambert"
@@ -17093,23 +17168,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "Завантажити об’єкт…"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "Завантажити дані мапи, що лежать на кінці обраної лінії"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "Завантажити зараз"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
 msgstr ""
-"Будь ласка, виберіть 4 або 5 ліній, щоб призначити заборону повороту ліворуч."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -17119,12 +17189,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "Тест {0}/{1}: Виконується {2}"
+msgstr "між {0} {1} та {2} {3}"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "Помилка при розборі {0}: {1}"
+msgstr "  додаю {0} {1}"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -17155,9 +17225,9 @@
 msgstr "Створити дублікат лінії"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "Шар для редагування GPX треків"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Перетворити на GPX шар зі знеособленим часом"
@@ -17167,5 +17237,5 @@
 msgstr "Редагувати Gpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "Редагувати gpx треки"
@@ -17174,11 +17244,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "Імпортувати шлях із шару даних GPX"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "Очистити існуючий шлях"
@@ -17188,5 +17258,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "Не знайдено шару даних GPX"
@@ -17196,13 +17266,13 @@
 msgstr "Сценарій-нащадок повернув непридатні дані."
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr "Правити інструмент"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr "Назва:"
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr "Командний рядок:"
@@ -17444,5 +17514,5 @@
 msgstr "Показати фотографії, що не мають координат"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "Імпортовані зображення"
@@ -17809,8 +17879,6 @@
 msgstr "Відкрити вікно вимірювань."
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "Скинути"
@@ -17842,5 +17910,5 @@
 msgstr "Кут між двома виділеними точками"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "Шар для проведення вимірювань"
@@ -17933,5 +18001,5 @@
 msgstr "Цикл завантаження OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "Показати проблеми з OpenStreetBugs"
@@ -18003,13 +18071,13 @@
 msgstr "Черга"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "автономний режим"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "в мережі"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -18126,95 +18194,95 @@
 msgstr "виконуваний файл Firefox"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "Помилка читання!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "Помилка запису!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "Записати координати в заголовок зображення"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr ""
 "Записати інформацію про місце знаходження в exif-розділ наступних файлів:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "налаштування"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "зберегти резервні копії"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "зміни час модифікації файлу:"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "на час за gps"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "на попереднє значення (незмінений mtime)"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr "Втулок геопозначення фотографій"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "Запис інформації про місце знаходження у файли зображень…"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "Неможливо прочитати mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "Неможливо записати mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "Файл не може бути знищений!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "Не вдається перейменувати файл!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr "<html><h3>Існують старі резервні файли в каталозі зображень!</h3>"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "Замінити старі резервні копії?"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "Зберігайте старі резервні копії і продовжити"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "Перезаписати"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "Не вдалося вилучити тимчасовий файл!"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "Тест не пройдено: Неможливо прочитати mtime."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "Тест не пройдено: Не можу записати mtime."
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "Записати координати в заголовок зображення"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -18255,9 +18323,9 @@
 msgstr "Новий шар зображення з файлу…"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "Зображення не створено належним чином."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "Не можливо знайти об’єкт на мапі"
@@ -18435,20 +18503,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "Об’єднана версія"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "підтверджувати всі дії віддаленого управління вручну."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Втулок, що дозволяє іншим програмам керувати JOSM"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "Дистанційне керування"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "Налаштування втулка віддаленого керування"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -18460,35 +18533,37 @@
 "сторонніх застосунків, що підключаються до втулка."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "Дозволені дії"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 "Втулок віддаленого керування отримав запит на завантаження даних з API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "Деталі запиту: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "Дозволити дію?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "Підтвердити дії Віддаленого керування"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr "Втулок віддаленого управління отримав запит на створення нової точки."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -18496,17 +18571,23 @@
 "посилання:"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr "Повністю повернути набір змін"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr "Повернути тільки виділене"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr "Повернути виділені та відновити вилучені об’єкти"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -18514,5 +18595,5 @@
 msgstr "Відмінити набір змін"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "Відновити"
@@ -18714,41 +18795,41 @@
 msgstr "Вилучити непотрібні точки з ділянки."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "Рухома мапа"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "Автомасштабування"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "Завантажити квадрат мапи"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "Показати дані квадрату"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "Завантажити всі квадрати мапи"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "Збільшити масштаб"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "Зменшити масштаб"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "Прив’язатися до розміру квадрата"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "Очистити кеш квадратів мапи"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "зображення "
@@ -19054,4 +19135,14 @@
 msgid "Terrace"
 msgstr "Ряд будинків по вулиці"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "Розділювач"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19826,6 +19917,6 @@
 msgstr "Додати відсутній теґ {0}={1}"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -19838,9 +19929,9 @@
 "якій вона з’єднується з лінією <span class=\"object-name\">{3}</span>."
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr "Розділити зараз"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr "Розділити лінію"
@@ -19923,6 +20014,6 @@
 msgstr "Знайдено {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -19930,5 +20021,5 @@
 msgstr "Помилки"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "Перевірка не виявила помилок"
@@ -20172,32 +20263,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "Об’єднати дублікати точок?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "Подвійні точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "Подвійні точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "Об’єднати дублікати точок?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "Подвійні точки"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "Об’єднати дублікати точок?"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -20236,5 +20321,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "Мультиполігон"
@@ -20759,5 +20844,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "ділянка"
@@ -20898,10 +20983,10 @@
 msgstr "{0}, …"
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr "Показати поточне положення у відео-фрагменті"
@@ -21050,10 +21135,10 @@
 "''{0}''"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -21258,9 +21343,5 @@
 "Це може призвести до помилкових координат."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "Автоматичне завантаження"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
@@ -21269,19 +21350,19 @@
 "спотворене"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(відключено)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматичне завантаження шару WMS ({0}), в масштабі {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Завантаження шару WMS ({0}), в масштабі {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -21296,17 +21377,17 @@
 "в будь-якому випадку?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "Так, отримати зображення"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "Невірний URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "Завантажити видимі квадрати мапи"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21315,48 +21396,52 @@
 "змініть розподільчу здатність"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "Змінити розподільчу здатність"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "Перезавантажити помилкові квадрати"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "Альфа-канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "Зберегти шар WMS у файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "Зберегти шар WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "Завантажити шар WMS з файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "Завантажити шар WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Непідтримувана версія файлу WMS; знайдено {0}, очікувалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "Помилка формату файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "Помилка завантаження файлу"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "Встановити закладку WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "Автоматичне завантаження"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -21435,5 +21520,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -21470,5 +21555,5 @@
 msgstr "Аудіопристрій недоступний"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -21491,5 +21576,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "лісовий масив"
@@ -21502,12 +21587,10 @@
 #. relation type
 #: build/specialmessages.java:17
-#, fuzzy
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr "створити зв’язок associatedStreet"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
@@ -21516,19 +21599,16 @@
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "Збільшення"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "високовольтна"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
@@ -21537,26 +21617,22 @@
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "Мережа"
+msgstr "мережа"
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "громадський транспорт"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Обмеження"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
@@ -21565,5 +21641,4 @@
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
@@ -21572,5 +21647,4 @@
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
@@ -21857,7 +21931,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "Завантажити з OSM дані уздовж цього треку"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -22091,6 +22164,11 @@
 msgstr "Зробити ряд будинків по вулиці з одного блоку."
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -22102,5 +22180,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -22111,5 +22189,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -22120,10 +22198,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr "Дозволяє відновлювати об’єкти, вилучені з бази даних OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -22134,5 +22212,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -22145,5 +22223,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -22154,15 +22232,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Просте завантаження уздовж довгого набору взаємопов’язаних шляхів"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Виділити послідовність з’єднаних ліній, що не розгалужуються"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -22173,5 +22251,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22306,5 +22384,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "Позначення"
@@ -22843,5 +22921,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "метал"
@@ -22854,5 +22932,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "ліс"
@@ -23156,9 +23234,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "так"
@@ -23268,9 +23346,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "ні"
@@ -23529,5 +23607,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "місцевого значення"
@@ -23576,5 +23654,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "службова"
@@ -23609,5 +23687,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "будується"
@@ -23694,5 +23772,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "пішохідна екскурсія"
@@ -23727,5 +23805,5 @@
 msgstr "добра"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "середня"
@@ -23895,14 +23973,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "Оператор"
@@ -24170,6 +24248,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "Висота над рівнем моря"
@@ -24617,5 +24695,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr "болото з відкритою водою"
@@ -25021,5 +25099,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "Напруга"
@@ -25383,31 +25461,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "Години роботи"
@@ -25467,90 +25545,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "Цілодобово"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Пн-Пт 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Вт-Сб 08:00-15:00; Нд 08:00-12:00"
@@ -25663,7 +25741,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr "Номер"
@@ -25679,5 +25757,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "підземна"
@@ -25690,6 +25768,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "Платна"
@@ -25865,5 +25943,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "В інвалідних візках"
@@ -25900,6 +25978,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr "Навіс"
@@ -25907,5 +25985,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "Лавка"
@@ -26024,5 +26102,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr "Сигнальний вогонь"
@@ -26183,5 +26261,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "Кухня"
@@ -26189,73 +26267,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "італійська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "китайська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "піца"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "бутерброди"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "грецька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "німецька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "індійська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "місцева"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr "кебаб/шашлик"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "турецька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "азійська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "тайська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "мексиканська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "японська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr "французька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "сандвічі"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "суші"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "Швидке харчування"
@@ -26263,17 +26346,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "Властивості Пунктів швидкого харчування"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr "риба і чіпси"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr "курятина"
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "Кафе"
@@ -26281,9 +26364,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "Властивості Кафе"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "Шинок"
@@ -26291,18 +26374,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "Властивості Шинка"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr "Пивний сад"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr "Властивості Пивного саду"
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "Бар"
@@ -26310,9 +26394,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "Властивості Бару"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "Нічний клуб"
@@ -26320,24 +26404,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "Властивості Нічного клубу"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "Атракціони"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "Властивості Атракціонів"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "Музей"
@@ -26345,9 +26429,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "Властивості Музею"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -26356,9 +26440,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "Властивості Зоопарку"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "Оглядовий майданчик"
@@ -26366,24 +26450,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "Властивості Оглядового майданчику"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr "Оглядова вежа"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "Парк розваг"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "Властивості Парку розваг"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "Витвори мистецтв"
@@ -26391,5 +26475,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "Властивості Витворів мистецтв"
@@ -26397,19 +26481,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "Інформаційне бюро"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "Мапа"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr "Тип мапи"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr "топографічна"
@@ -26447,5 +26531,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26453,28 +26537,28 @@
 msgstr "мапа вулиць"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr "план-схема"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr "Територія"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr "місцевість"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "місто"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr "область"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr "Детальний опис"
@@ -26484,5 +26568,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr "Маршрути на мапі:"
@@ -26490,5 +26574,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "піші"
@@ -26496,6 +26580,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "Велоспорт"
@@ -26503,5 +26587,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr "для гірського велосипеду"
@@ -26509,6 +26593,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "Лижі"
@@ -26516,5 +26600,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr "кінні"
@@ -26522,46 +26606,54 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr "…інші можливі способи пересування"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "Інформаційна дошка"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr "Вміст покажчика"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr "повідомлення"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "історична довідка"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "жива природа"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "рослини"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "Вказівний стовп"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+#, fuzzy
+msgid "Flagpole"
+msgstr "стовп"
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr "Інформаційний термінал"
@@ -26569,29 +26661,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr "Детальний опис"
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr "Аудіогід"
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr "Аудіогід за допомогою мобільного телефону?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "Номер телефону"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "Інші інформаційні пункти"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr "Властивості Навісу"
@@ -26599,25 +26691,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "Вогнище"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "Місце для пікніка"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "Властивості Місця для пікніка"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "Історичні місця"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "За́мок"
@@ -26626,19 +26718,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "Властивості Замку"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "Руїни"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "Властивості Руїн"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "Археологічні пам’ятки"
@@ -26647,9 +26739,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "Властивості Археологічних пам’яток"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "Поле бою"
@@ -26657,10 +26749,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "Властивості Поля бою"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr "Палеонтологічні пам’ятки"
@@ -26668,5 +26760,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr "Властивості Палеонтологічних пам’яток"
@@ -26674,15 +26766,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "Монумент"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "Властивості Монументу"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "Пам’ятник"
@@ -26690,55 +26782,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "Властивості Пам’ятнику"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr "Придорожній Хрест"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr "Властивості Придорожнього Хреста"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr "Придорожня Рака"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr "Властивості Придорожньої Раки"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "Прикордонний камінь"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "Властивості Прикордонного каменя"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "Дозвілля"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "Властивості Аквапарку"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "Ігровий майданчик"
@@ -26746,35 +26838,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "Властивості Ігрового майданчику"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "Рибалка"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "Властивості місця для рибалки"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "Спортивні споруди"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "Стадіон"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "Властивості Стадіону"
@@ -26788,6 +26880,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "види спорту:"
@@ -27203,31 +27295,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "спорт"
@@ -27237,240 +27329,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "багатоборство"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "стрільба з лука"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr "американський футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "австралійський футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr "боче (петанк)"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "боулз"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr "канадський футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "каное"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "скелелазіння"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr "тренувальні сітки для крикету"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "собачі перегони"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "кінний спорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr "гаельський футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "гімнастика"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "кінські перегони"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "мотоспорт"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr "пелота"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr "ракетбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr "ліга регбі"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr "союз регбі"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "стрільба"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr "катання на ковзанах"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "катання на лижах"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "плавання"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "настільний теніс"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "теніс"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "Спортивний центр"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "Властивості Спортивного центру"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr "Спортивний майданчик"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr "Властивості Спортивного майданчику"
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "Бігова доріжка"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "Властивості Бігової доріжки"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "Поле для гольфу"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "Властивості Поля для гольфу"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "Міні-гольф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "Властивості Поля для міні-гольфу"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "Багатоборство"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "Правити Багатоборство"
@@ -27512,23 +27604,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "тип"
@@ -27570,211 +27662,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr "спортивний майданчик"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "спортивний центр"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "стадіон"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr "бігова доріжка"
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr "Боулінг (10-кегельний)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr "Властивості Боулінгу"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "Властивості Атлетики"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "Стрільба з лука"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "Властивості Стрільби з лука"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "Скелелазіння"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "Властивості Скелелазіння"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "Веслування"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "Властивості Каное"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "Властивості Велоспорту"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "Собачі перегони"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "Властивості Собачих перегонів"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "Кінний спорт"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "Властивості Кінного спорту"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "Кінні перегони"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "Властивості Кінських перегонів"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "Гімнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "Властивості Гімнастики"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "Мотоспорт"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "Властивості Мотоспорту"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "Катання на ковзанах"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "Властивості Катання на ковзанах"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "Властивості Скейтбордингу"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "Плавання"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "Властивості Плавання"
@@ -27782,52 +27874,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "Властивості Катання на лижах"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr "Тип лижні"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr "гірські лижі"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr "бігові лижі"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr "сніговий парк"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "Складність"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "початковий рівень"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "легкий рівень"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "складний рівень"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "для професіоналів"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr "фрірайд"
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "Стрільба"
@@ -27835,204 +27927,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "Властивості Стрільби"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "Спорт (з м’ячем)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "Властивості Футболу"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Австралійський футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "Властивості Австралійського футболу"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr "Американський футбол"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr "Властивості Американського футболу"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr "Канадський футбол"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr "Властивості Канадського футболу"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr "Гаельський футбол"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr "Властивості Гаельського футболу"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr "Ліга регбі"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr "Властивості Ліги регбі"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr "Союз регбі"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr "Властивості Союзу регбі"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "Властивості Бейсболу"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "Властивості Бейсболу"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "Гольф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "Властивості Гольфу"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "поле для гольфу"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr "Боче"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr "Властивості боче"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "Боулз"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "Властивості Боулз"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr "Властивості Крикету"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr "Тренувальні сітки для крикету"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr "Властивості Тренувальних сіток для крикету"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "Властивості Крокету"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "Властивості Хокею"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "Властивості Пелоти"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr "Ракетбол"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr "Властивості Ракетболу"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "Настільний теніс"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "Властивості Настільного тенісу"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "Теніс"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "Властивості Тенісу"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "Штучного походження"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "Будівля"
@@ -28040,5 +28132,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "Громадські будівлі"
@@ -28046,10 +28138,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "Властивості Громадської будівлі"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "Міська державна адміністрація"
@@ -28057,10 +28149,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "Властивості Міської державної адміністрації"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "Амбасада"
@@ -28068,10 +28160,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "Властивості Амбасади"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "Суд"
@@ -28080,10 +28172,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "Властивості Суду"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "В’язниця"
@@ -28092,10 +28184,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "Властивості В’язниці"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "Поліція/міліція"
@@ -28105,10 +28197,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "Властивості Поліції/міліції"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "Пожежна станція"
@@ -28117,10 +28209,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "Властивості Пожежного депо"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "Пошта"
@@ -28128,5 +28220,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "Властивості Пошти"
@@ -28134,15 +28226,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "Дитячий садок"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "Властивості Дитячого саду"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "Школа"
@@ -28150,10 +28242,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "Властивості Школи"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "Університет"
@@ -28161,10 +28253,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "Властивості Університету"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "Коледж"
@@ -28172,5 +28264,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "Властивості коледжу"
@@ -28178,5 +28270,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "Кіно"
@@ -28185,10 +28277,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "Властивості Кінотеатру"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "Бібліотека"
@@ -28197,9 +28289,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "Властивості Бібліотеки"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "Центр мистецтв"
@@ -28207,10 +28299,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "Властивості Центру мистецтв"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "Театр"
@@ -28219,10 +28311,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "Властивості Театру"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "Культове місце"
@@ -28232,5 +28324,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "Властивості Культового місця"
@@ -28239,6 +28331,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "Релігія"
@@ -28247,66 +28339,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "бахаі"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "буддизм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "християнство"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "індуїзм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "джайнізм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "іудаїзм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "іслам"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "сикхізм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr "спіритуалізм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "даосизм"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr "уніатство"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "Віросповідання"
@@ -28315,81 +28407,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "англіканська"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "баптизм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "католицизм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "євангелізм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr "свідки ієгови"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "лютеранство"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "методизм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "мормонство"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "православ’я"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "п’ятидесятники"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "пресвітеріанство"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "протестантизм"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "квакери"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "шиїти"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "суніти"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "Адреси"
@@ -28398,5 +28490,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "Властивості Адреси"
@@ -28404,5 +28496,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "Номер будинку"
@@ -28410,25 +28502,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "Назва будинку"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "Вулиця"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "Назва міста"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "Поштовий індекс"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "Код країни"
@@ -28437,5 +28529,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr "Властивості Вставки адрес"
@@ -28443,61 +28535,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "Схема нумерації"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "непарні"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "парні"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "за абеткою"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "Штучні об’єкти"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "Заводи"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "Властивості Заводів"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "Башта"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "Властивості Башти"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "Тип Башти"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "зв’язку"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "спостереження"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "Висота (в метрах)"
@@ -28505,25 +28597,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "Водонапірна вежа"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "Властивості Водонапірної вежі"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "Властивості Газгольдера"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -28531,10 +28623,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "Властивості Маяка"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "Вітряк"
@@ -28542,10 +28634,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "Властивості Вітряка"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "Трубопровід"
@@ -28554,41 +28646,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "Властивості Трубопроводу"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr "тепло"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr "нафта"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr "каналізація"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr "іншого призначення"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "Розташування"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr "підводне"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr "надземне"
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "Очисні споруди"
@@ -28598,10 +28690,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "Властивості Очисних споруд"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "Кран"
@@ -28609,5 +28701,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "Властивості Крану"
@@ -28615,10 +28707,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr "Властивості Сигнального вогню"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "Геодезичний пункт"
@@ -28626,10 +28718,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "Властивості Геодезичного пункту"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "Камера спостереження"
@@ -28637,23 +28729,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "Властивості Камери спостереження"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr "внутрішня"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "зовнішня"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr "загальнодоступне"
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "Електростанція"
@@ -28663,35 +28755,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "Властивості Електростанції"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "вітряна"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "гідро"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "теплова"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "вугільна"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "сонячна"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "Електропідстанція"
@@ -28700,10 +28792,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "Властивості Електропідстанції"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr "Трансформаторна будка"
@@ -28712,5 +28804,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr "Властивості Трансформаторної будки"
@@ -28718,10 +28810,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr "назва (номер) мережі"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "Опора ЛЕП"
@@ -28732,23 +28824,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "Властивості Опори ЛЕП"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr "опора"
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr "стовп"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr "Номер опори"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "Лінія електропередач"
@@ -28757,22 +28849,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "Властивості Лінії електропередач"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr "Тип лінії"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "високовольтна"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28780,55 +28870,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr "Кількість кабелів"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Кількість проводів (краще: провідників) на кабель"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr "один провід"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr "два проводи"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr "три проводи"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr "чотири проводи"
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "Зручності"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "Туалет"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr "обмежений"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr "Примітка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "Поштова скринька"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "Телефон"
@@ -28837,5 +28927,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "Властивості телефону"
@@ -28843,5 +28933,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "Монети"
@@ -28849,5 +28939,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr "Банкноти"
@@ -28855,5 +28945,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "Електронні гаманці та платіжні картки"
@@ -28861,5 +28951,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr "Дебетові картки"
@@ -28867,15 +28957,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "Кредитні картки"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "Телефонні картки"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "Пункт прийому вторинної сировини"
@@ -28884,5 +28974,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "Властивості Пункту прийому вторинної сировини"
@@ -28890,35 +28980,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "Батарейки/Акумулятори"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "Бляшанки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "Одяг/Дрантя"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "Скло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "Папір"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "Металобрухт"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr "Урна для сміття"
@@ -28926,5 +29016,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr "Властивості Урни для сміття"
@@ -28933,31 +29023,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr "Спинка"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "Матеріал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "камінь"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "пластик"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "Колір"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "чорний"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "коричневий"
@@ -29036,39 +29126,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "зелений"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "червоний"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "синій"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "сірий"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "білий"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "Кількість місць"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr "Мисливська вежа"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr "Властивості Мисливської вежі"
@@ -29077,30 +29167,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "Висота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "низька"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "половинна"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "повна"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "Прихована"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "Зачиняється"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "Фонтан"
@@ -29109,10 +29199,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "Властивості Фонтану"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "Питна вода"
@@ -29121,10 +29211,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "Властивості Питної води"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "Пожежний гідрант"
@@ -29133,5 +29223,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "Властивості Пожежного гідранту"
@@ -29139,5 +29229,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "Вікно для покинутих немовлят"
@@ -29145,15 +29235,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "Властивості Вікна для покинутих немовлят"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "Автомобільний дилер"
@@ -29161,10 +29251,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "Властивості Автомобільного дилера"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "Веломагазин"
@@ -29173,28 +29263,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "Властивості Веломагазина"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "Властивості Супермаркету"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr "Побутова хімія"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr "Властивості Магазину побутової хімії"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "Міні-маркет"
@@ -29202,9 +29292,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "Властивості Міні-маркету"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr "Кіоск"
@@ -29212,27 +29302,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr "Властивості Кіоску"
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "Книжковий магазин"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "Властивості Книжкового магазину"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "Турагентство"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "Властивості Турагентства"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "М’ясна лавка"
@@ -29240,9 +29330,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "Властивості М’ясної лавки"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "Булочна"
@@ -29250,9 +29340,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "Властивості Булочної"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "Квітковий магазин"
@@ -29260,18 +29350,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "Властивості Квіткового магазину"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "Екологічно чисті продукти"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "Властивості Магазину екологічно чистих проуктів"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "Алкогольні напої"
@@ -29279,54 +29369,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "Властивості Магазину алкогольних напоїв"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "Напої"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "Властивості Магазину напоїв"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "Комп’ютери"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "Властивості Комп’ютерної крамниці"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "Електроніка"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "Властивості Магазину побутової електроніки"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Аудіо апаратура"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "Властивості Магазину Аудіо апаратури"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "Меблі"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "Властивості Меблевого магазину"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "Садово-парковий центр"
@@ -29334,9 +29424,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "Властивості Магазину садово-паркових товарів"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "Господарські товари"
@@ -29344,9 +29434,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "Властивості Магазину господарських товарів"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "Зроби сам"
@@ -29354,54 +29444,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "Властивості Магазину «Зроби сам»"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "Канцтовари"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "Властивості Магазину канцтоварів"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "Перукарня"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "Властивості Перукарні"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "Взуття"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "Властивості Магазину взуття"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "Іграшки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "Властивості Магазину іграшок"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "Відео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "Властивості Магазину відео"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "Хімчистка"
@@ -29409,9 +29499,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "Властивості Хімчистки"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "Пральня"
@@ -29419,9 +29509,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "Властивості Пральні"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "Товари для активного відпочинку"
@@ -29429,24 +29519,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "Властивості Магазину товарів для активного відпочинку"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "Властивості Магазину спорт-товарів"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "Оптика"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "Властивості Магазину оптики"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "Торговий автомат"
@@ -29454,5 +29544,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "Властивості Торгового автомата"
@@ -29460,97 +29550,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "Товар"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr "квитки на громадський транспорт"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr "схеми громадського транспорту"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr "талони на паркування"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "продукти харчування"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "напої"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "солодощі"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "сигарети"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "фотографії"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "їжа для тварин"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "газети"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "іграшки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr "телефонні картки"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr "вело шини"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr "пакети для екскрементів"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr "накопичувальні, дисконтні карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "Гроші"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "Банк"
@@ -29558,14 +29648,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "Властивості Банку"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "Обмін валют"
@@ -29573,5 +29663,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "Властивості Пункту обміну валют"
@@ -29579,15 +29669,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "Властивості Банкомату"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "Медицина"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "Лікар"
@@ -29595,18 +29685,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "Властивості Лікаря"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "Стоматологія"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "Властивості Стоматології"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -29614,5 +29704,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "Властивості Аптеки"
@@ -29620,9 +29710,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "За рецептом"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "Лікарня"
@@ -29630,10 +29720,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "Властивості Лікарні"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "Пункт швидкої допомоги"
@@ -29642,5 +29732,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "Властивості Пункту швидкої допомоги"
@@ -29649,20 +29739,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr "Номер пункту"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr "Назва пункту"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "Номер телефону"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Використовуйте міжнародний код, наприклад: +38-044-1030000)"
@@ -29670,5 +29760,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -29677,64 +29767,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "Властивості Ветеренарного пункту"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "Географія"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "Місця"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr "Властивості Континенту"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "Країна"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "Властивості Країни"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr "Штат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr "Властивості Штату"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr "Область"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr "Властивості Області"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "Район"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "Властивості Району"
@@ -29742,15 +29832,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "Місто (понад 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "Властивості Міста"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "Місто"
@@ -29758,10 +29848,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "Властивості Селища"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "Передмістя"
@@ -29769,25 +29859,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "Властивості Передмістя"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "Властивості Села"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr "Хутір"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr "Властивості Хутора"
@@ -29795,5 +29885,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr "Місцевість"
@@ -29801,10 +29891,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr "Властивості Місцевості"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "Острів"
@@ -29812,10 +29902,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "Властивості Острова"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr "Острівець"
@@ -29823,5 +29913,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr "Властивості Острівця"
@@ -29829,5 +29919,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "Вхід до печери"
@@ -29835,10 +29925,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "Властивості Входу до печери"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "Вершина"
@@ -29846,10 +29936,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "Властивості Вершини"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "Льодовик"
@@ -29857,10 +29947,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "Властивості Льодовика"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "Вулкан"
@@ -29868,70 +29958,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "Властивості Вулкану"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "Кордони"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "Державний"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "Властивості Державного кордону"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "Адміністративний"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "Властивості Адміністративного кордону"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "Громад"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "Властивості Меж громад"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "Політичні"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "Властивості політичного кордону"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "Національний парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "Властивості Кордону національного парку"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "Землекористування"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "Дерево"
@@ -29940,15 +30030,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "Властивості Дерева"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "Ботанічна назва"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr "Ліс"
@@ -29957,5 +30047,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr "Властивості Лісу"
@@ -29963,17 +30053,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "хвойний"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "листяний"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "мішаний"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "Лісовий масив"
@@ -29982,14 +30072,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "Властивості Лісового масиву"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "Заповідник"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "Властивості Заповідника"
@@ -29997,25 +30087,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr "Осип"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr "Властивості Осипи"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr "Чагарник"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr "Властивості Чагарнику"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr "Кам’яниста земля"
@@ -30023,10 +30113,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr "Властивості Кам’янистої землі"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr "Пустир"
@@ -30034,5 +30124,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr "Властивості Пустиря"
@@ -30040,5 +30130,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr "Двір ферми"
@@ -30047,45 +30137,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr "Властивості Двору ферми"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "Сільськогосподарські угіддя"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "Властивості Сільськогосподарських угідь"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "Левада"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "Властивості Левади"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr "Властивості Виноградників"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr "Горо́д"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr "Властивості Го́родів"
@@ -30093,25 +30183,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "Сад"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "Властивості Садів"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "Газон"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr "Властивості Газону"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr "Сільський майдан"
@@ -30119,10 +30209,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr "Властивості Сільського майдану"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr "Землі місцевої громади"
@@ -30130,20 +30220,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr "Властивості Земель місцевої громади"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "Властивості Парку"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr "Майданчик для ігор"
@@ -30151,5 +30241,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr "Властивості Майданчику для ігор"
@@ -30157,15 +30247,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr "Житлова зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr "Властивості Житлової зони"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr "Цвинтар"
@@ -30173,9 +30263,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr "Властивості Цвинтаря"
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr "Кладовище"
@@ -30183,39 +30273,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr "Властивості Кладовища"
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr "Роздрібна торгівля"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr "Властивості Зони роздрібної торгівлі"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr "Діловий район"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr "Властивості Ділового району"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "Промзона"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr "Властивості Промзони"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr "Територія залізниці"
@@ -30223,15 +30313,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr "Властивості Території залізниці"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr "Військова зона"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr "Властивості Військової зони"
@@ -30239,50 +30329,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr "Будівельний майданчик"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr "Властивості Будівельного майданчику"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr "Очищене місце під забудову"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr "Властивості Очищеного місця під забудову"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr "Ділянка під нову забудову"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr "Властивості Ділянки під нову забудову"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr "Звалище"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr "Властивості Звалища"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr "Кар’єр"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr "Властивості Кар’єра"
@@ -30292,5 +30382,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr "Властивості Мультиполігону"
@@ -30302,5 +30392,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr "зовнішній сегмент"
@@ -30308,5 +30398,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr "внутрішній сегмент"
@@ -30314,5 +30404,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr "Кордони"
@@ -30323,5 +30413,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr "Властивості Кордонів"
@@ -30329,36 +30419,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr "Тип Кордону"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr "адміністративний"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr "національний"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr "громади"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr "політичний"
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr "Адміністративний рівень"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr "Підпорядкована територія"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr "Адміністративний центр"
@@ -30366,5 +30456,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr "Обмеження на поворот"
@@ -30373,5 +30463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr "Властивості Обмеження на поворот"
@@ -30379,34 +30469,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr "Обмеження"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr "поворот ліворуч заборонений"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr "поворот праворуч заборонений"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr "проїзд заборонений"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr "розворот заборонений"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr "тільки праворуч"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr "тільки ліворуч"
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr "тільки прямо"
@@ -30415,15 +30505,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "з"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "через точку або лінію"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "до"
@@ -30431,5 +30521,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "Маршрут"
@@ -30438,5 +30528,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "Властивості маршруту"
@@ -30444,5 +30534,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "Тип маршруту"
@@ -30550,5 +30640,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30559,17 +30649,17 @@
 msgstr "велосипедний"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "автобусний"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "дорога"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "поромний"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr "лижний"
@@ -30637,5 +30727,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -30645,9 +30735,9 @@
 msgstr "піший"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "трамвайний"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr "об’їзд"
@@ -30661,10 +30751,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr "Опис символів"
@@ -30672,31 +30762,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "Мережа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr "Стан маршруту"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr "планований"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr "альтернативний"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr "тимчасовий"
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "з’єднуючий"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "Колір (hex)"
@@ -30705,30 +30795,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr "відрізок маршруту"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr "наступний відрізок"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr "попередній відрізок"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr "кінцева точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr "наступна кінцева точка"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr "попередня кінцева точка"
@@ -30955,5 +31045,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "застарілий"
@@ -31606,4 +31696,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -31707,11 +31805,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr "штучний"
@@ -32224,5 +32322,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr "пірс"
@@ -32236,5 +32334,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr "трубопровід"
@@ -32378,13 +32476,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr "розваги"
@@ -32398,5 +32496,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr "гавань"
@@ -32492,10 +32590,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr "зручності"
@@ -32597,10 +32695,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr "зручності пересування"
@@ -33038,24 +33136,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr "зручності прості"
@@ -33087,6 +33185,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr "легка вода"
@@ -33147,8 +33245,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr "медицина"
@@ -33501,26 +33599,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr "магазин"
@@ -33592,8 +33690,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "готель"
@@ -33694,9 +33792,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr "туристичний"
@@ -33784,9 +33882,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr "історичний"
@@ -33799,5 +33897,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr "кар’єр"
@@ -33811,5 +33909,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr "звалище"
@@ -33831,5 +33929,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr "водойма"
@@ -33843,5 +33941,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr "двір ферми"
@@ -33864,5 +33962,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr "роздрібна торгівля"
@@ -33876,5 +33974,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr "промисловість"
@@ -33888,5 +33986,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr "очищене місце під забудову"
@@ -33900,5 +33998,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr "місце під нову забудову"
@@ -33912,5 +34010,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr "територія залізниці"
@@ -33967,7 +34065,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr "військовий"
@@ -33981,5 +34079,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr "кладовище"
@@ -33992,5 +34090,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr "гірська вершина"
@@ -34005,5 +34103,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr "льодовик"
@@ -34017,5 +34115,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "вулкан"
@@ -34070,8 +34168,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr "довкілля"
@@ -34085,5 +34183,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr "чагарник"
@@ -34097,5 +34195,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr "верес"
@@ -34109,5 +34207,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "ліс"
@@ -34121,5 +34219,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr "грязь"
@@ -34133,5 +34231,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "пляж"
@@ -34209,8 +34307,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "маршрут"
@@ -34299,12 +34397,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "кордон"
@@ -34454,11 +34552,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr "місцевість"
@@ -34472,5 +34570,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr "дані TIGER"
@@ -34826,9 +34924,21 @@
 msgstr "Італія – Сицилія"
 
-#~ msgid "closedway"
-#~ msgstr "замкнена лінія"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "Об’єкт типу {0} з ідентифікатором {1} має неправильну версію"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Виділена лінія не містить виділену точку."
+#~ msgstr[1] "Виділена лінія не містить виділених точок"
+#~ msgstr[2] "Виділена лінія не містить всіх виділених точок"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Градуси у Хвилинах Секундах"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr ""
+#~ "Введіть коментар для даних, що надсилаються на сервер (мін. 3 знаки)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Будь ласка, введіть коментар для надсилання на сервер цього набору змін "
+#~ "(мін. 3 символи)"
 
 #~ msgid "Error: {0}"
@@ -35051,4 +35161,7 @@
 #~ msgstr "Встановити значення ідентифікатора в 0"
 
+#~ msgid "closedway"
+#~ msgstr "замкнена лінія"
+
 #~ msgid "Point on angle of building to start drawing"
 #~ msgstr "Вкажіть кут будівлі, щоб почати креслення"
@@ -35106,4 +35219,7 @@
 #~ msgstr "C"
 
+#~ msgid "Target of type {0} with id {1} has invalid version"
+#~ msgstr "Об’єкт типу {0} з ідентифікатором {1} має неправильну версію"
+
 #~ msgid "Create house number and street name relation"
 #~ msgstr "Створити зв’язок номеру будинку з вулицею"
Index: applications/editors/josm/i18n/po/zh_CN.po
===================================================================
--- applications/editors/josm/i18n/po/zh_CN.po	(revision 22569)
+++ applications/editors/josm/i18n/po/zh_CN.po	(revision 22569)
@@ -0,0 +1,33831 @@
+# Simplified Chinese translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: josm\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-08-04 03:46+0000\n"
+"Last-Translator: mmyfl <Unknown>\n"
+"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. FIXME why is help not a JosmAction?
+#. Strings in JFileChooser
+#: ../core/src/org/openstreetmap/josm/Main.java:213
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
+#: build/specialmessages.java:50
+msgid "Help"
+msgstr "帮助"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:440
+#, java-format
+msgid "Ignoring malformed file URL: \"{0}\""
+msgstr "忽略格式不良的文件 URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:441
+#: ../core/src/org/openstreetmap/josm/Main.java:474
+#: ../core/src/org/openstreetmap/josm/Main.java:561
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:535
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+msgid "Warning"
+msgstr "警告"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
+msgstr "参数 \"downloadgps\" 不能使用文件名称或文件 URL"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:560
+#, java-format
+msgid "Ignoring malformed URL: \"{0}\""
+msgstr "忽略不正确的 URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
+msgid "About"
+msgstr "关于"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
+msgid "Display the about screen."
+msgstr "显示 关于 画面"
+
+#. TODO: put in a platformHook for system that have no console by default
+#. Add the name of this application
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+msgid "Java OpenStreetMap Editor"
+msgstr "Java OpenStreetMap 编辑器"
+
+#. Add the version number
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#, java-format
+msgid "Version {0}"
+msgstr "版本 {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
+#, java-format
+msgid "Last change at {0}"
+msgstr "最后修改于{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#, java-format
+msgid "Java Version {0}"
+msgstr "Java 版本 {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
+msgid "Homepage"
+msgstr "主页"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+msgid "Bug Reports"
+msgstr "错误报告"
+
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Camping"/>
+#. </button>
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
+#: build/trans_surveyor.java:64
+msgid "Info"
+msgstr "信息"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
+msgid "Readme"
+msgstr "说明"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
+msgid "Revision"
+msgstr "修订"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
+msgid "Contribution"
+msgstr "贡献者"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
+msgid "License"
+msgstr "许可协议"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:66
+msgid "Plugins"
+msgstr "插件"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
+msgid "About JOSM..."
+msgstr "关于 JOSM..."
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44
+#, java-format
+msgid ""
+"WARNING: unexpected format of API base URL. Redirection to info or history "
+"page for OSM primitive will probably fail. API base URL is: ''{0}''"
+msgstr ""
+"警告：不是期望中的 API 基础 URL 格式。重定向至 OSM 主网站的信息或历史纪录页面"
+"可能会失败。API 基础 URL为: ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
+#, java-format
+msgid ""
+"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
+"user will probably fail. API base URL is: ''{0}''"
+msgstr ""
+"警告：不是期望中的 API 基础 URL 格式。重定向至 OSM 使用者的个人页面可能会失"
+"败。API 基础 URL为: ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
+#, java-format
+msgid ""
+"You are about to launch {0} browser windows.<br>This may both clutter your "
+"screen with browser windows<br>and take some time to finish."
+msgstr ""
+"您即将开启 {0} 个浏览器窗口。<br>这可能会使屏幕被浏览器窗口塞满<br>并且得花上"
+"一些时间才能完成。"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
+msgid "Continue"
+msgstr "继续"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
+#, java-format
+msgid "Click to continue and to open {0} browsers"
+msgstr "请点击继续来开启 {0} 个浏览器窗口"
+
+#. Strings in JFileChooser
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
+#: ../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:308
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+#: build/specialmessages.java:33
+msgid "Cancel"
+msgstr "取消"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
+msgid "Click to abort launching external browsers"
+msgstr "请点击以放弃启动外部浏览器"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
+msgid "Please select at least one already uploaded node, way, or relation."
+msgstr "请至少选择一个已上传的节点，路径或关系。"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:62
+msgid "Please select the target layer."
+msgstr "请选择目标图层。"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:66
+msgid "Select target layer"
+msgstr "选择目标图层"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
+msgid "Merge"
+msgstr "合并"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:80
+#, java-format
+msgid ""
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr "<html>来源图层<br>\"{0}\"<br>中没有任何图层可合并。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
+msgid "No target layers"
+msgstr "没有目标图层"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35
+msgid "Add Node..."
+msgstr "添加节点..."
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25
+msgid "Add a node by entering latitude and longitude."
+msgstr "由经纬度添加节点"
+
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
+#, java-format
+msgid "Edit: {0}"
+msgstr "编辑: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
+msgid "Align Nodes in Circle"
+msgstr "将节点排成圆"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+msgid "Move the selected nodes into a circle."
+msgstr "将选取的节点移动到圆内。"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:37
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:51
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
+#, java-format
+msgid "Tool: {0}"
+msgstr "工具: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
+msgid "Please select at least four nodes."
+msgstr "请至少选择4个节点."
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:930
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
+#: ../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:120
+msgid "Information"
+msgstr "信息"
+
+#. Do it!
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
+msgid "Align Nodes in Line"
+msgstr "直线排列节点"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
+msgid "Move the selected nodes in to a line."
+msgstr "将选取的点排列到直线上"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
+msgid "Please select at least three nodes."
+msgstr "请选择至少3个节点."
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+msgid "data"
+msgstr "数据"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33
+msgid "layer"
+msgstr "图层"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34
+msgid "selection"
+msgstr "选择"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
+msgid "conflict"
+msgstr "冲突"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36
+msgid "download"
+msgstr "下载"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
+msgid "previous"
+msgstr "上一个"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
+msgid "next"
+msgstr "下一个"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210
+msgid "Nothing selected to zoom to."
+msgstr "没有选择缩放对象."
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121
+#, java-format
+msgid "Zoom to {0}"
+msgstr "缩放到 {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:120
+#, java-format
+msgid "Zoom the view to {0}."
+msgstr "将视图缩放至 {0} 。"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
+#, java-format
+msgid "View: {0}"
+msgstr "查看: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:210
+msgid "No conflicts to zoom to"
+msgstr "没有冲突可以缩放"
+
+#: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
+msgid "Changeset Manager"
+msgstr "更改组合管理器"
+
+#: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:37
+msgid "Toggle visibility of Changeset Manager window"
+msgstr "切换更改组合管理视窗的透明度"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:384
+msgid "Close open changesets"
+msgstr "关闭开的放更改组合"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
+msgid "Closes open changesets"
+msgstr "关闭开放的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64
+#, java-format
+msgid "File: {0}"
+msgstr "文件: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81
+msgid "There are no open changesets"
+msgstr "没有开放的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
+msgid "No open changesets"
+msgstr "没有开放的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44
+msgid "Downloading open changesets ..."
+msgstr "下载开放的更改组合..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+msgid "Combine Way"
+msgstr "合并路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+msgid "Combine several ways into one."
+msgstr "合并多个路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+msgid "Change directions?"
+msgstr "改变方向？"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
+msgid "Reverse and Combine"
+msgstr "反转后组合"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
+msgid ""
+"The ways can not be combined in their current directions.  Do you want to "
+"reverse some of them?"
+msgstr "以这些路径目前的方向是不能组合的。是否要将它们中的一部分反转？"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
+msgid ""
+"Could not combine ways (They could not be merged into a single string of "
+"nodes)"
+msgstr "不能组合路径（它们无法合并为单一的节点串）"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
+#, java-format
+msgid "Combine {0} ways"
+msgstr "合并 {0} 条路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
+msgid "Please select at least two ways to combine."
+msgstr "请选择至少两个以上的路径来合并"
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:230
+msgid "Copy"
+msgstr "复制"
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:28
+msgid "Copy selected objects to paste buffer."
+msgstr "复制选取的对象到剪贴板"
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:79
+msgid "Please select something to copy."
+msgstr "请选择要复制的对象."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+msgid "Create Circle"
+msgstr "创建圆形"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+msgid "Create a circle from three selected nodes."
+msgstr "从三个选取的节点建立圆形。"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204
+msgid "Those nodes are not in a circle. Aborting."
+msgstr "这些节点不在一个圆上。正在中止。"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr "请正确的选择二或三个节点，或一条只有二或三个节点的路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
+#: ../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:1019
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
+#: ../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/PluginPreference.java:507
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:753
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:246
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:278
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96
+msgid "Delete"
+msgstr "删除"
+
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
+msgid "Delete selected objects."
+msgstr "删除选择的对象。"
+
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209
+msgid "File exists. Overwrite?"
+msgstr "文件已存在. 覆盖吗?"
+
+#. Do it!
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
+msgid "Distribute Nodes"
+msgstr "将各节点散开"
+
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
+msgid "Distribute the selected nodes to equal distances along a line."
+msgstr "依一条直线将选取的节点等距离散布。"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+msgid "Download from OSM..."
+msgstr "从 OSM 下载..."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+msgid "Download map data from the OSM server."
+msgstr "从 OSM 服务器下载地图数据"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
+msgid "Download object..."
+msgstr "下载对象..."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
+msgid "Download OSM object by ID."
+msgstr "从 OSM 通过 ID 下载对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:39
+msgid "Download Object..."
+msgstr "下载对象..."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:69
+msgid "Separate Layer"
+msgstr "另一图层"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "如果资料要下载到新的图层里请选择此项"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:47
+msgid "Download referrers"
+msgstr "下载关联对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:48
+msgid "Select if the referrers of the object should be downloaded as well"
+msgstr "如果希望下载关联的对象请选择此项"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:56
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
+msgid "Object type:"
+msgstr "对象类型:"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:58
+msgid "Choose the OSM object type"
+msgstr "选择 OSM 对象类型"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:63
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:85
+msgid "Object ID:"
+msgstr "对象 ID:"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:65
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "输入要下载的对象 ID:"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
+msgid "Download Object"
+msgstr "下载对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
+msgid "Download object"
+msgstr "下载对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:84
+msgid "Start downloading"
+msgstr "开始下载"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
+msgid "Close dialog and cancel downloading"
+msgstr "关闭对话并取消下载"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99
+msgid "Invalid ID specified. Cannot download object."
+msgstr "指定了无效的 ID。不能下载对象。"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
+msgid "Download parent ways/relations..."
+msgstr "下载上层路径/关系..."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
+msgid "Download primitives referring to one of the selected primitives"
+msgstr "下载参照到已选取原型中之一的原型"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
+msgid "Duplicate"
+msgstr "制作副本"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
+msgid "Duplicate selection by copy and immediate paste."
+msgstr "制作副本会复制选择区域并立即粘贴上。"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+msgid "Duplicate Layer"
+msgstr "复制图层"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+msgid "Make a duplicate of the currently selected layer."
+msgstr "制作目前选取图层的复本。"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
+#, java-format
+msgid "Layer: {0}"
+msgstr "图层: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, java-format
+msgid "Copy of {0}"
+msgstr "{0} 的副本"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr "{0} 的副本 {1}"
+
+#. <button label="Info" hotkey="I">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Info"/>
+#. </button>
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:24
+#: build/trans_surveyor.java:68
+msgid "Exit"
+msgstr "退出"
+
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+msgid "Exit the application."
+msgstr "退出程序."
+
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+msgid "Fullscreen View"
+msgstr "全屏视图"
+
+#. no icon
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+msgid "Toggle fullscreen view"
+msgstr "切换全屏视图"
+
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+msgid "Toggle Fullscreen view"
+msgstr "切换全屏视图"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
+msgid "Export to GPX..."
+msgstr "输出到 GPX..."
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
+msgid "Export the data to GPX file."
+msgstr "输出数据到 GPX..."
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+msgid "Nothing to export. Get some data first."
+msgstr "没有东西可输出。请先取得一些资料。"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+msgid "Export GPX file"
+msgstr "输出 GPX 文件"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
+msgid "Object history"
+msgstr "对象历史记录"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
+msgid "Display history information about OSM ways, nodes, or relations."
+msgstr "显示 OSM 路径，节点或关系的历史纪录信息。"
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
+msgid "Info about Element"
+msgstr "元素的信息"
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
+msgid "Display object information about OSM nodes, ways, or relations."
+msgstr "显示 OSM 路径，节点或关系的对象信息。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
+msgid "Join overlapping Areas"
+msgstr "联接重叠的区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
+msgid "Joins areas that overlap each other"
+msgstr "联接彼此互相重叠的区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126
+msgid "Please select at least one closed way that should be joined."
+msgstr "请选择至少一个要连结的封闭路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
+msgid "Only up to two areas can be joined at the moment."
+msgstr "目前只能連結兩個區域。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:139
+#, java-format
+msgid "\"{0}\" is not closed and therefore cannot be joined."
+msgstr "\"{0}\" 尚未封闭因此不能连结。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:73
+msgid "The selected way has nodes outside of the downloaded data region."
+msgid_plural ""
+"The selected ways have nodes outside of the downloaded data region."
+msgstr[0] "选取的路径有节点位于已下载的资料区域之外。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
+msgid "This can lead to nodes being deleted accidentally."
+msgstr "这样可能会造成节点被意外的删除。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156
+msgid "Are you really sure to continue?"
+msgstr "您确定要继续吗？"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
+msgid "Please abort if you are not sure"
+msgstr "如果不确定请放弃"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+msgid "No intersection found. Nothing was changed."
+msgstr "找不到交叉点。没有东西变更。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:200
+msgid "Added node on all intersections"
+msgstr "在所有的交叉点加入节点"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229
+msgid "Delete Ways that are not part of an inner multipolygon"
+msgstr "删除不属于内部多重多边形的一部分的路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234
+msgid "Fix relations"
+msgstr "修正关系"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239
+msgid "Joined self-overlapping area"
+msgstr "已连结自我重叠的区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
+msgid "Joined overlapping areas"
+msgstr "已连结重叠的区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244
+msgid ""
+"Some of the ways were part of relations that have been modified. Please "
+"verify no errors have been introduced."
+msgstr "部分属于关系的一部分的路径被修改了。请检查是否造成错误。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307
+msgid "Enter values for all conflicts."
+msgstr "为所有冲突的项目输入值。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:308
+msgid "Solve Conflicts"
+msgstr "解决冲突"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:323
+msgid "Fix tag conflicts"
+msgstr "修正标签冲突"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:486
+msgid "Removed Element from Relations"
+msgstr "从关系中移除元件"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:610
+msgid "Join Areas: Remove Short Ways"
+msgstr "连结区域:移除短路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:630
+msgid "Closed Way"
+msgstr "封闭的路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+msgid "Remove tags from inner ways"
+msgstr "移除内部路径的标签"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:966
+msgid "Join Areas Function"
+msgstr "连结区域功能"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+msgid "Join Node to Way"
+msgstr "将节点与路径相连"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+msgid "Join a node into the nearest way segments"
+msgstr "将节点连结到最近的路段"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
+msgid "Join Node and Line"
+msgstr "连结节点与直线"
+
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:44
+msgid "No Shortcut"
+msgstr "没有快捷键"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
+msgid "Jump To Position"
+msgstr "跳至位置"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
+msgid "Opens a dialog that allows to jump to a specific location"
+msgstr "开启能跳到指定位置的对话框"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57
+msgid "Enter Lat/Lon to jump to position."
+msgstr "输入要跳至地点的经/纬度。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59
+msgid "You can also paste an URL from www.openstreetmap.org"
+msgstr "您也可以粘贴上 www.openstreetmap.org 的网址"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
+#: ../plugins/grid/src/grid/GridLayer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
+msgid "Latitude"
+msgstr "纬度"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
+#: ../plugins/grid/src/grid/GridLayer.java:195
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
+msgid "Longitude"
+msgstr "经度"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91
+msgid "Zoom (in metres)"
+msgstr "缩放(以米计)"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
+msgid "Jump there"
+msgstr "跳至那里"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104
+msgid "Jump to Position"
+msgstr "跳到位置"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
+msgid "Could not parse Latitude, Longitude or Zoom. Please check."
+msgstr "无法粘贴上纬度，经度或缩放级别。请检查。"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
+msgid "Unable to parse Lon/Lat"
+msgstr "无法分析经/纬度"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+msgid "Merge layer"
+msgstr "合并图层"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+msgid "Merge the current layer into another layer"
+msgstr "将当前的图层合并到另一个图层"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+msgid "Merge Nodes"
+msgstr "合并节点"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+msgid "Merge nodes into the oldest one."
+msgstr "将节点合并到最旧的一个中。"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:67
+msgid "Please select at least two nodes to merge."
+msgstr "请至少选取两个节点来合并"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+msgid "Abort Merging"
+msgstr "放弃合并"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+msgid "Click to abort merging nodes"
+msgstr "点击以放弃合并节点"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
+msgstr "不能合并节点:必须删除仍在使用中的路径 “{0}”。"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:269
+#, java-format
+msgid "Merge {0} nodes"
+msgstr "合并 {0} 个节点"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
+msgid "Merge selection"
+msgstr "合併選擇區域"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+msgid "Merge the currently selected primitives into another layer"
+msgstr "将目前选取的原型合并到另一个图层"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
+msgid "Mirror"
+msgstr "镜像"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+msgid "Mirror selected nodes and ways."
+msgstr "镜像反射选取的节点和路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
+msgid "Please select at least one node or way."
+msgstr "请选择至少一个节点或路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+msgid "up"
+msgstr "向上"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:48
+#, java-format
+msgid "Move objects {0}"
+msgstr "移动对象 {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+msgid "down"
+msgstr "向下"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+msgid "left"
+msgstr "向左"
+
+#. dir == Direction.RIGHT) {
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
+msgid "right"
+msgstr "向右"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#, java-format
+msgid "Move {0}"
+msgstr "移动 {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:58
+#, java-format
+msgid "Moves Objects {0}"
+msgstr "移动对象 {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
+msgid "Cannot move objects outside of the world."
+msgstr "不能将对象移动到世界外面"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34
+msgid "Move Node..."
+msgstr "移动节点..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
+msgid "Edit latitude and longitude of a node."
+msgstr "编辑节点的经度和纬度。"
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+msgid "New Layer"
+msgstr "新建图层"
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+msgid "Create a new map layer."
+msgstr "创建一个新的地图图层。"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:48
+msgid "Open..."
+msgstr "打开..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47
+msgid "Open a file."
+msgstr "打开一个文件."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:82
+msgid "Opening files"
+msgstr "正在打开文件"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:101
+#, java-format
+msgid "Cannot open {0} file with the file importer ''{1}''."
+msgid_plural "Cannot open {0} files with the file importer ''{1}''."
+msgstr[0] "不能以文件处理程序 \"{1}\" 打开 {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#, java-format
+msgid "Cannot open {0} file because no suitable file importer is available."
+msgid_plural ""
+"Cannot open {0} files because no suitable file importer is available."
+msgstr[0] "不能开启文件 {0}，因为没有合适的文件处理程可用。"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:189
+#, java-format
+msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
+msgstr "<html>不能开启目录 \"{0}\"。<br>请选择一个文件。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:190
+msgid "Open file"
+msgstr "打开文件"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:252
+msgid "Opening 1 file..."
+msgstr "正在开启 1 个文件..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:254
+#, java-format
+msgid "Opening {0} file..."
+msgid_plural "Opening {0} files..."
+msgstr[0] "正在开启 {0} 个文件..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:262
+#, java-format
+msgid "Opening file ''{0}'' ..."
+msgstr "正在开启文件 \"{0}\" ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
+msgid "Open Location..."
+msgstr "打开位置..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+msgid "Open an URL."
+msgstr "打开一个 URL。"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
+msgid "Enter URL to download:"
+msgstr "输入要下载的 URL:"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
+msgid "Enter an URL from where data should be downloaded"
+msgstr "输入用来下载数据的 URL:"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
+msgid "Download Location"
+msgstr "下载位置"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+msgid "Download URL"
+msgstr "下载 URL"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
+msgid "Start downloading data"
+msgstr "开始下载数据"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+msgid "Download Data"
+msgstr "下载数据"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
+msgid ""
+"<h3>When one or more ways are selected, the shape is adjusted such, that all "
+"angles are 90 or 180 degrees.</h3>You can add two nodes to the selection. "
+"Then, the direction is fixed by these two reference nodes. (Afterwards, you "
+"can undo the movement for certain nodes:<br>Select them and press the "
+"shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
+msgstr ""
+"<h3>当选取一或多个路径后，形状会被调整，使所有的角都是90或180度。</h3>您可以"
+"在选择区域中加入两个节点。这样它的方向就会被这两个参考节点所修正。（之后，您"
+"可以复原某些节点的移动如下：<br>选择它们并按下直角化/复原的快捷键。预设值为 "
+"Shift-Q。）"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:199
+msgid "Orthogonalize Shape"
+msgstr "形状直角化"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
+msgid "Move nodes so all angles are 90 or 180 degrees"
+msgstr "移动节点使所有的角度为 90 或 180 度"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+msgid "Orthogonalize Shape / Undo"
+msgstr "形状直角化/撤销"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:80
+msgid "Undo orthogonalization for certain nodes"
+msgstr "撤销某些节点的直角化"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:101
+msgid "Orthogonalize / Undo"
+msgstr "直角化/撤销"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108
+msgid ""
+"Orthogonalize Shape / Undo\n"
+"Please select nodes that were moved by the previous Orthogonalize Shape "
+"action!"
+msgstr ""
+"形状直角化/撤销\n"
+"请选择被前一次形状直角化动作所移动的节点!"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110
+msgid "Undo Orthogonalize Shape"
+msgstr "撤销形状直角化"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:120
+msgid ""
+"<html>You are using the EPSG:4326 projection which might lead<br>to "
+"undesirable results when doing rectangular alignments.<br>Change your "
+"projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+"<html>您使用的EPSG：4326投影法会导致在进行<br>矩形排列时产生不想要的结果。"
+"<br>改变您的投影法可以去除这项警告。<br>是否要继续？</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
+msgid "Selection must consist only of ways and nodes."
+msgstr "选择区域必须由路径和节点组成。"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:188
+msgid "Orthogonalize"
+msgstr "直角化"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:205
+msgid "Usage"
+msgstr "使用说明"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:206
+msgid "Selected Elements cannot be orthogonalized"
+msgstr "选取的元素不能直角化"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:264
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+"<html>请确定所有选取的路径都朝着类似的方向<br>或是分次将它们一个个直角化。</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:417
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "请选择角度大约为 90 或 180 度的路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:353
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:263
+msgid "Paste"
+msgstr "粘贴"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
+msgid "Paste contents of paste buffer."
+msgstr "从剪贴板粘贴内容。"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:153
+msgid "Delete incomplete members?"
+msgstr "是否删除不完整的成员？"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+msgid "Paste without incomplete members"
+msgstr "粘贴时不包含不完整的成员"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:156
+msgid ""
+"The copied data contains incomplete primitives.  When pasting the incomplete "
+"primitives are removed.  Do you want to paste the data without the "
+"incomplete primitives?"
+msgstr ""
+"复制的资料含有不完整的原型。当粘贴的时候不完整的原型会被移除。您确定要粘贴含"
+"有不完整原型的数据吗？"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+msgid "Paste Tags"
+msgstr "粘贴标签"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+msgid "Apply tags of contents of paste buffer to all selected items."
+msgstr "将剪贴板的标签粘贴到所有选取的项目上。"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
+#, java-format
+msgid "Pasting {0} tag"
+msgid_plural "Pasting {0} tags"
+msgstr[0] "正在粘贴 {0} 个标签"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:111
+#, java-format
+msgid "to {0} primitive"
+msgid_plural "to {0} primtives"
+msgstr[0] "到 {0} 个原型"
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+msgid "Preferences..."
+msgstr "首选项..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+msgid "Open a preferences dialog for global settings."
+msgstr "开启全域偏好设定对话框。"
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:95
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:380
+msgid "Redo"
+msgstr "重做"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+msgid "Redo the last undone action."
+msgstr "重做上次撤消的动作."
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
+msgid "Rename layer"
+msgstr "重命名图层"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
+msgid "Also rename the file"
+msgstr "同时重命名文件"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
+#, java-format
+msgid "Could not rename file ''{0}''"
+msgstr "无法重命名文件 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java: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/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:105
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:120
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1098
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
+msgid "Error"
+msgstr "错误"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+msgid "Reverse Ways"
+msgstr "反转路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+msgid "Reverse the direction of all selected ways."
+msgstr "反转所有选取路径的方向。"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45
+msgid "Please select at least one way."
+msgstr "请选择至少一条路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75
+msgid "Reverse ways"
+msgstr "反转路径"
+
+#. Strings in JFileChooser
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
+#: build/specialmessages.java:65
+msgid "Save"
+msgstr "保存"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
+msgid "Save the current data."
+msgstr "保存当前数据."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
+#, java-format
+msgid "File {0} exists. Overwrite?"
+msgstr "文件 {0} 已存在。覆盖？"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+msgid "No Exporter found! Nothing saved."
+msgstr "找不到输出程序！没有保存任何东西。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
+msgid "Empty document"
+msgstr "空文档"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+msgid "Save anyway"
+msgstr "依然保存"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "The document contains no data."
+msgstr "文档中没有数据."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgid "Conflicts"
+msgstr "冲突"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+msgid "Reject Conflicts and Save"
+msgstr "拒绝冲突项目并保存"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr "尚有未解决的冲突。如果您全部拒绝就不会保存冲突。是否继续？"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
+msgid "Save OSM file"
+msgstr "保存 OSM 文件"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+msgid "Save GPX file"
+msgstr "保存 GPX 文件"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
+msgid "Save Layer"
+msgstr "保存图层"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
+msgid "Save As..."
+msgstr "另存为..."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
+msgid "Save the current data to a new file."
+msgstr "将目前的数据保存为新的文件。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
+msgid "Select All"
+msgstr "全选"
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr "选择数据图层中所有取消删除的对象。这样也会选择不完整的对象。"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43
+msgid "Show Status Report"
+msgstr "显示状态报告"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
+msgid "Show status report with useful information that can be attached to bugs"
+msgstr "显示有与程序错误相关信息的状态报告"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42
+#, java-format
+msgid "Help: {0}"
+msgstr "帮助: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:119
+msgid "Status Report"
+msgstr "状态报告"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+msgid "Copy to clipboard and close"
+msgstr "复制到剪贴簿并关闭"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
+msgid "Close"
+msgstr "关闭"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
+msgid "Simplify Way"
+msgstr "简化路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
+msgid "Delete unnecessary nodes from a way."
+msgstr "删除路径不需要的节点。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:69
+msgid "Yes, delete nodes"
+msgstr "是，删除节点"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:69
+msgid "Delete nodes outside of downloaded data regions"
+msgstr "删除在已下载数据区域外的节点"
+
+#: ../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:222
+msgid "No, abort"
+msgstr "否，中止"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:119
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
+msgid "Cancel operation"
+msgstr "取消操作"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:74
+msgid "Do you want to delete them anyway?"
+msgstr "是否要强制删除它们?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:88
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:75
+msgid "Delete nodes outside of data regions?"
+msgstr "是否删除在数据区域外的节点?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:101
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:82
+msgid "Please select at least one way to simplify."
+msgstr "请选择至少一条路径来简化。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
+msgid "Yes"
+msgstr "是"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:113
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
+msgid "Simplify all selected ways"
+msgstr "简化所有选取的路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
+#, java-format
+msgid ""
+"The selection contains {0} ways. Are you sure you want to simplify them all?"
+msgstr "选择范围中包含 {0} 个路径。您确定要简化它们全部吗?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:129
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:89
+msgid "Simplify ways?"
+msgstr "是否要简化路径?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:180
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:137
+#, java-format
+msgid "Simplify {0} way"
+msgid_plural "Simplify {0} ways"
+msgstr[0] "简化 {0} 路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:251
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:265
+#, java-format
+msgid "Simplify Way (remove {0} node)"
+msgid_plural "Simplify Way (remove {0} nodes)"
+msgstr[0] "简化路径 (删除{0} 个节点)"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
+msgid "Split Way"
+msgstr "切割路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+msgid "Split a way at the selected node."
+msgstr "在选取的节点上切割路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
+msgstr "不能在选取的节点上切割路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "选取的节点不在同一个路径上。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
+msgstr[0] "选取的节点不在任何路径上。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+msgid ""
+"There is more than one way using the node you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the nodes you selected. Please select the "
+"way also."
+msgstr[0] "节点上不只有一个路径。请同时选取你想切割的路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
+msgid "You must select two or more nodes to split a circular way."
+msgstr "你必须选择两个以上的节点来切割一个环状路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
+msgid ""
+"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
+"middle of the way.)"
+msgstr "此路径不能从选取的节点分割。 (提示：选取的节点在路径的中央。)"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>以角色为基础的关系成员会复制到所有的新路径。<br>必要时您应该检验并修正"
+"它。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>将关系成员复制到所有的新路径。<br>您应该验证这一点，必要时予以纠正。</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr "将路径 {0} 分割为 {1} 个部分"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+msgid "Toggle GPX Lines"
+msgstr "切换 GPX 线条"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+msgid "Draw lines between raw gps points."
+msgstr "绘出原始 GPS 点之间的线条。"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#, java-format
+msgid "Toggles the global setting ''{0}''."
+msgstr "切换全城设定值 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
+msgid "UnGlue Ways"
+msgstr "分离路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+msgid "Duplicate nodes that are used by multiple ways."
+msgstr "重制由多条路径使用的节点。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+msgid "This node is not glued to anything else."
+msgstr "这个节点并未黏合到其他项目上。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+msgid "None of these nodes are glued to anything else."
+msgstr "这些节点没有一个黏合到其他项目上。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106
+msgid "None of this way''s nodes are glued to anything else."
+msgstr "这个路径的节点没有一个黏合到其他项目上。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+msgid "The current selection cannot be used for unglueing."
+msgstr "目前的选择区域不能用于取消黏合。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+msgid "Select either:"
+msgstr "选择其一："
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid "* One tagged node, or"
+msgstr "* 一个有标签的节点，或"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+msgid "* One node that is used by more than one way, or"
+msgstr "* 一个用于多条路径的节点，或"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+msgid "* One node that is used by more than one way and one of those ways, or"
+msgstr "* 一个用于多条路径或用于那些路径之一的节点，或"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
+msgstr "* 一个有一或更多节点用于多条路径的路径，或"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+msgid ""
+"* One way and one or more of its nodes that are used by more than one way."
+msgstr "* 一个路径且其一或多个节点用于多条路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+msgid ""
+"Note: If a way is selected, this way will get fresh copies of the unglued\n"
+"nodes and the new nodes will be selected. Otherwise, all ways will get "
+"their\n"
+"own copy and all nodes will be selected."
+msgstr ""
+"注意：如果选取了路径，这个路径会取得取消黏合节点的最新复本并且会\n"
+"选取这些新节点。否则，所有路径会取得他们自己的复本而且所有的节点\n"
+"都会被选取。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
+msgid "Unglued Node"
+msgstr "分离节点"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#, java-format
+msgid "Dupe into {0} nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#, java-format
+msgid "Dupe {0} node into {1} nodes"
+msgid_plural "Dupe {0} nodes into {1} nodes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:374
+msgid "Undo"
+msgstr "撤消"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+msgid "Undo the last action."
+msgstr "撤消上一步操作."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+msgid "Unselect All"
+msgstr "取消全择"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+msgid "Unselect all objects."
+msgstr "取消选择所有的对象。"
+
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+msgid "Unselect All (Focus)"
+msgstr "取消全选(焦点)"
+
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+msgid "Unselect All (Escape)"
+msgstr "取消全选(跳出)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27
+msgid "Update data"
+msgstr "更新数据"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25
+msgid "Updates the objects in the active data layer from the server."
+msgstr "从服务器更新使用中数据图层的对象。"
+
+#. bounds defined? => use the bbox downloader
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
+msgid "Download data"
+msgstr "下载数据"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:28
+msgid "Update modified"
+msgstr "更新已修改的"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:26
+msgid ""
+"Updates the currently modified objects from the server (re-downloads data)"
+msgstr "从服务器更新目前已修改的对象(重新下载数据)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
+msgid "No current dataset found"
+msgstr "找不到目前的数据组合"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
+#, java-format
+msgid "Did not find an object with id {0} in the current dataset"
+msgstr "在目前的数据组合中找不到 id {0} 的对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
+msgid "Update selection"
+msgstr "更新选择区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87
+msgid ""
+"Updates the currently selected objects from the server (re-downloads data)"
+msgstr "从服务器更新目前选取的对象(重新下载数据)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+msgid "There are no selected objects to update."
+msgstr "没有选择的对象需要更新。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+msgid "Selection empty"
+msgstr "选择区域是空的"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89
+msgid "Upload data"
+msgstr "上传数据"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr "将使用中图层的所有变更上传至 OSM 服务器"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+#, java-format
+msgid ""
+"<html>The data to be uploaded participates in unresolved conflicts of layer "
+"''{0}''.<br>You have to resolve them first.</html>"
+msgstr ""
+"<html>要上传的数据影响到的图层 \"{0}\" 仍未解决冲突。 <br>您必须先解决它们。"
+"</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:116
+msgid "No changes to upload."
+msgstr "没有要上传的变更。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+msgid "Nothing to upload. Get some data first."
+msgstr "没有要上传的项目。请先取得一些数据。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
+msgid "Upload selection"
+msgstr "上传选择区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
+msgid "Upload all changes in the current selection to the OSM server."
+msgstr "将目前的选择区域上传至 OSM 服务器。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:256
+msgid "Checking parents for deleted objects"
+msgstr "正在检查被删除对象的上层项目"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:315
+#, java-format
+msgid "Reading parents of ''{0}''"
+msgstr "正在读取 \"{0}\" 的上层项目"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:321
+msgid "Checking for deleted parents in the local dataset"
+msgstr "正在检查在本地数据组合中被删除的上层项目"
+
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23
+msgid "Wireframe View"
+msgstr "线框视图"
+
+#. no icon
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:25
+msgid "Enable/disable rendering the map as wireframe only"
+msgstr "启用/停用只以线框绘制地图"
+
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
+msgid "Toggle Wireframe view"
+msgstr "切换线框视图"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+msgid "Zoom In"
+msgstr "放大"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
+msgid "Zoom Out"
+msgstr "缩小"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20
+msgctxt "audio"
+msgid "Back"
+msgstr "返回"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgctxt "audio"
+msgid "Jump back."
+msgstr "跳回。"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15
+#, java-format
+msgid "Audio: {0}"
+msgstr "音效：{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15
+msgctxt "audio"
+msgid "Faster"
+msgstr "加速"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+msgctxt "audio"
+msgid "Faster Forward"
+msgstr "快进"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19
+msgctxt "audio"
+msgid "Forward"
+msgstr "前进"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgctxt "audio"
+msgid "Jump forward"
+msgstr "跳前"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
+msgctxt "audio"
+msgid "Next Marker"
+msgstr "下一个标记"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgctxt "audio"
+msgid "Play next marker."
+msgstr "播放下一个标记。"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgctxt "audio"
+msgid "Play/Pause"
+msgstr "播放/暂停"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+msgid "Play/pause audio."
+msgstr "播放/暂停声音"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
+msgctxt "audio"
+msgid "Previous Marker"
+msgstr "上一个标记"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+msgctxt "audio"
+msgid "Play previous marker."
+msgstr "播放上一个标记。"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15
+msgctxt "audio"
+msgid "Slower"
+msgstr "减速"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+msgctxt "audio"
+msgid "Slower Forward"
+msgstr "慢进"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49
+msgid "Downloading GPS data"
+msgstr "正在下载 GPS 数据"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76
+msgid "Downloaded GPX Data"
+msgstr "已下载的 GPX 数据"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82
+msgid "Downloading data"
+msgstr "正在下载数据"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94
+#, java-format
+msgid ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr "忽略的例外，因为下载已被取消。例外为：{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:142
+msgid "No data found in this area."
+msgstr "在这个区域中找不到数据。"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:67
+#, java-format
+msgid "Download {0} of {1} ({2} left)"
+msgstr "下载 {0} / {1} (剩下 {2})"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
+msgid "Updating data"
+msgstr "正在更新数据"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:148
+msgid "Check on the server"
+msgstr "检查服务器"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
+msgid ""
+"Click to check whether objects in your local dataset are deleted on the "
+"server"
+msgstr "点击以检查在您本地数据组合中的对象是否在服务器中已被删除"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:154
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:117
+msgid "Ignore"
+msgstr "忽略"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:156
+msgid "Click to abort and to resume editing"
+msgstr "点击以放弃或恢复编辑"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162
+#, java-format
+msgid ""
+"There is {0} object in your local dataset which might be deleted on the "
+"server. If you later try to delete or update this the server is likely to "
+"report a conflict."
+msgid_plural ""
+"There are {0} objects in your local dataset which might be deleted on the "
+"server. If you later try to delete or update them the server is likely to "
+"report a conflict."
+msgstr[0] ""
+"在您本地数据组合中有{0} 个对象可能在服务器上已经删除了。如果您稍后尝试删除或"
+"更新到服务器，很可能会回复为冲突。"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169
+#, java-format
+msgid ""
+"Click <strong>{0}</strong> to check the state of this object on the server."
+msgid_plural ""
+"Click <strong>{0}</strong> to check the state of these objects on the server."
+msgstr[0] "点击<strong>{0}</strong> 以检查这个对象在服务器上的状态。"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#, java-format
+msgid "Click <strong>{0}</strong> to ignore.</html>"
+msgstr "点击 <strong>{0}</strong> 以忽略。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:178
+msgid "Deleted or moved objects"
+msgstr "已删除或移动的对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:244
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "在大量下载时发生下列错误：{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "下载时发生错误"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:474
+#, java-format
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "在输入过程中发生 {0} 个冲突。"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:181
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "下载时发生冲突"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:222
+#, java-format
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) 正在载入节点 {2} 的上层项目"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:223
+#, java-format
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) 正在载入路径 {2} 的上层项目"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:224
+#, java-format
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) 正在载入关系 {2} 的上层项目"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Error during download"
+msgstr "下载时发生错误"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+msgid "Delete Mode"
+msgstr "删除模式"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
+msgid "Delete nodes or ways."
+msgstr "删除节点或路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
+#, java-format
+msgid "Mode: {0}"
+msgstr "模式：{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:247
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: do not delete unused nodes "
+"when deleting a way. Ctrl: delete referring objects."
+msgstr ""
+"点击可进行删除。Shift：删除路径区段。Alt：删除路径时不要删除未使用的节点。"
+"Ctrl：删除参考的对象。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+msgid "Draw"
+msgstr "绘制"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+msgid "Draw nodes"
+msgstr "绘制节点"
+
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+msgid "Mode: Draw Focus"
+msgstr "模式：绘制焦点"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+msgid "Cannot add a node outside of the world."
+msgstr "不能在这个世界以外的地方加入节点。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535
+msgid "Add node"
+msgstr "加入节点"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537
+msgid "Add node into way"
+msgstr "将节点加入路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+msgid "Connect existing way to node"
+msgstr "将既存的路径连接到节点"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547
+msgid "Add a new node to an existing way"
+msgstr "在既存的路径加入新的节点"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549
+msgid "Add node into way and connect"
+msgstr "将节点加入路径并连接"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:942
+msgid "Create new node."
+msgstr "建立新的节点。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+msgid "Select node under cursor."
+msgstr "选取游标下的节点。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#, java-format
+msgid "Insert new node into way."
+msgid_plural "Insert new node into {0} ways."
+msgstr[0] "插入新的节点到{0} 路径中。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+msgid "Start new way from last node."
+msgstr "从最后的节点开始新的路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
+msgid "Continue way from last node."
+msgstr "从最后的节点继续路径。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:984
+msgid "Finish drawing."
+msgstr "结束绘制。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+msgid "Extrude"
+msgstr "推出"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+msgid "Create areas"
+msgstr "建立区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
+msgid "Extrude Way"
+msgstr "推出路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr "以平常的方式移动一个区段，然后放开鼠标按钮。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
+msgid "Draw a rectangle of the desired size, then release the mouse button."
+msgstr "绘出想要尺寸的矩形，然后放开鼠标按钮。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
+msgstr "拖曳一个路径来制作矩形。按 Ctrl 后拖曳并以平常的方式移动一个区段。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
+msgid "Drag play head"
+msgstr "拖放播放开头"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
+msgid ""
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
+msgstr ""
+"将播放开头拖曳并放至要播放音效的轨迹旁；按SHIFT+释放就会从那一点同步化音效。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
+msgid "Select"
+msgstr "选择"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
+msgid "Select, move and rotate objects"
+msgstr "选择、移动和旋转对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
+#, java-format
+msgid "Add and move a virtual new node to way"
+msgid_plural "Add and move a virtual new node to {0} ways"
+msgstr[0] "加入并移动虚拟新节点至{0}路径"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
+msgid "Move elements"
+msgstr "移动元素"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Move them"
+msgstr "移动它们"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Undo move"
+msgstr "取消移动"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#, java-format
+msgid ""
+"You moved more than {0} elements. Moving a large number of elements is often "
+"an error.\n"
+"Really move them?"
+msgstr ""
+"您已经移动超过{0} 个元素。移动大量的元素通常是因为错误而造成的。\n"
+"真的要移动它们吗?"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "放开鼠标按钮以选择矩形内的对象。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr "放开鼠标按钮以停止移动。按Ctrl 则会与最近的节点合并。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to stop rotating."
+msgstr "放开鼠标按钮以停止旋转。"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
+msgid ""
+"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
+"Ctrl to rotate selected; or change selection"
+msgstr ""
+"以拖曳移动对象；按Shift 加入选择区域(Ctrl 可切换)；Shift-Ctrl 会旋转选取的；"
+"或改变选择区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+msgid "Zoom"
+msgstr "缩放"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom and move map"
+msgstr "缩纹并移动地图"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73
+msgid ""
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
+"move zoom with right button"
+msgstr ""
+"拖曳或Ctrl+. 或Ctrl+, 来缩放；Ctrl+up, left, down, right 可移动；按右键可移动"
+"缩放"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
+msgid "<not>"
+msgstr "<非>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
+msgid "<or>"
+msgstr "<或>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
+msgid "<left parent>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+msgid "<right parent>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+msgid "<colon>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+msgid "<equals>"
+msgstr "<等于>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+msgid "<key>"
+msgstr "<设定键>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+msgid "<question mark>"
+msgstr "<问号>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
+msgid "<end-of-file>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
+msgid "Search..."
+msgstr "查找..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+msgid "Search for objects."
+msgstr "查找对象。"
+
+#. -- prepare the combo box with the search expressions
+#.
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
+msgid "Please enter a filter string."
+msgstr "请输入过滤条件字串。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
+msgid "Please enter a search string."
+msgstr "请输入查找字串。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142
+msgid "Enter the search expression"
+msgstr "请输入查找语词"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+msgid "replace selection"
+msgstr "取代选择区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
+msgid "add to selection"
+msgstr "加入至选择区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
+msgid "remove from selection"
+msgstr "从选择区域删除"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+msgid "find in selection"
+msgstr "在选择区域中寻找"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
+msgid "case sensitive"
+msgstr "区分大小写"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161
+msgid "all objects"
+msgstr "所有的对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162
+msgid "Also include incomplete and deleted objects in search."
+msgstr "查找也包含不完整和已删除的对象。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+msgid "regular expression"
+msgstr "正则表示式"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
+msgstr "<b>Baker Street</b> - \"Baker\" 和 \"Street\" 出现在何设定键或名称中。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
+msgstr "<b>\"Baker Street\"</b> - \"Baker Street\" 出现在何设定键或名称中。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
+msgstr "<b>name:Bak</b> - \"Bak\" 出现在名称中的任何地方。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
+msgstr "<b>type=route</b> - 含有设定键 \"type\" 为 \"route\" 者。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+msgid ""
+"<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
+"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
+msgstr ""
+"<b>type=*</b> - 设定键 \"type\" 为任何数值。也可以使用 <b>*=value</b>、"
+"<b>type=</b>、<b>*=*</b>、<b>*=</b>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
+msgstr "<b>-name:Bak</b> - 名称中没有 \"Bak\"。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
+msgstr "<b>是否为单行道?</b> - oneway=yes, true, 1 或on"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+msgid "<b>foot:</b> - key=foot set to any value."
+msgstr "<b>foot:</b> - key=foot 设定为任何数值。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+msgid "<u>Special targets:</u>"
+msgstr "<u>特殊的目标：</u>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+msgid ""
+"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr ""
+"<b>类型：</b> - 对象的类型(<b>节点(node)</b>, <b>路径(way)</b>, <b>关系"
+"(relation)</b> )"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+msgid "<b>user:</b>... - all objects changed by user"
+msgstr "<b>使用者：</b>... - 所有由某使用者改变的对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
+msgstr "<b>user:anonymous</b> - 所有对象是由匿名使用者所改变的"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+msgid "<b>id:</b>... - object with given ID (0 for new objects)"
+msgstr "<b>id:</b>... - 以此为ID 的对象(0 为新的对象)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid ""
+"<b>version:</b>... - object with given version (0 objects without an "
+"assigned version)"
+msgstr "<b>版本：</b>... - 查看这个版本的对象(未指定版本则为0 个对象)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+msgid ""
+"<b>changeset:</b>... - object with given changeset id (0 objects without "
+"assigned changeset)"
+msgstr ""
+"<b>更改组合：</b>... - 查看这个更改组合id 的对象(未指定更改组合则为0 个对象)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
+msgstr "<b>节点：</b>... - 有指定数量的节点的对象(nodes:count 或nodes:min-max)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>tags:</b>... - 以此数字为标签的对象(tags:count 或tags:min-max)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+msgid "<b>role:</b>... - object with given role in a relation"
+msgstr "<b>角色：</b>... - 在关系中指定角色的对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+msgid ""
+"<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
+"12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
+msgstr ""
+"<b>时间戳记：</b>... - 有此时间戳记的对象 (<b>2009-11-12T14:51:09Z</b>，"
+"<b>2009-11-12</b > 或 <b>T14:51</b> ...)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+msgid "<b>modified</b> - all changed objects"
+msgstr "<b>修改过</b> - 所有改变过的对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+msgid "<b>selected</b> - all selected objects"
+msgstr "<b>选取的</b> - 所有选取的对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+msgid "<b>incomplete</b> - all incomplete objects"
+msgstr "<b>不完整</b> - 所有不完整的对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+msgid "<b>untagged</b> - all untagged objects"
+msgstr "<b>未标签的</b> - 所有未标签的对象"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgstr "<b>child <i>expr</i></b> - 所有对象的子项符合正则表示式的"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
+msgstr "<b>parent <i>expr</i></b> - 所有对象父项符合正则表示式的"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
+msgstr "使用<b>|</b> 或<b>OR</b> 做逻辑或运算"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
+msgstr "使用<b>\"</b> 将运算子包起来 (例如 当键值包含<b>:</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+msgid ""
+"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
+"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
+msgstr ""
+"有引号的字串<b>\"</b> 和<b>\\</b> 字节需要在前头加上<b>\\</b> (例如 <b>\\\" "
+"</b> 和<b>\\\\</b>)。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
+msgid "Use <b>(</b> and <b>)</b> to group expressions"
+msgstr "使用<b>(</b> 和<b>)</b> 将正则表示式群组起来"
+
+#. Strings in JFileChooser
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
+#: build/specialmessages.java:47
+msgid "Filter"
+msgstr "过滤条件"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
+msgid "Search"
+msgstr "查找"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+msgid "Submit filter"
+msgstr "送出过滤条件"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+msgid "Start Search"
+msgstr "开始查找"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231
+#, java-format
+msgid ""
+"Search expression is not valid: \n"
+"\n"
+" {0}"
+msgstr ""
+"搜索表达式是无效的：\n"
+"\n"
+" {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
+msgid "Invalid search expression"
+msgstr "无效的搜索表达式"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
+#, java-format
+msgid "No match found for ''{0}''"
+msgstr "找不到 \"{0}\" 的符合项"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410
+#, java-format
+msgid "Nothing added to selection by searching for ''{0}''"
+msgstr "查找 \"{0}\" 的结果没有任何项目可加入选择区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412
+#, java-format
+msgid "Nothing removed from selection by searching for ''{0}''"
+msgstr "查找 \"{0}\" 的结果没有任何项目可自选择区域删除"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414
+#, java-format
+msgid "Nothing found in selection by searching for ''{0}''"
+msgstr "在选择区域中查找不到 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
+#, java-format
+msgid "Found {0} matches"
+msgstr "找到 {0} 个符合项"
+
+#. case sensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457
+msgctxt "search"
+msgid "CS"
+msgstr "CS"
+
+#. case insensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458
+msgctxt "search"
+msgid "CI"
+msgstr "CI"
+
+#. regex search
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460
+msgctxt "search"
+msgid "RX"
+msgstr "RX"
+
+#. all elements
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462
+msgctxt "search"
+msgid "A"
+msgstr "A"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
+"\n"
+"{2}"
+msgstr ""
+"正则表示式 \"{0}\" 在 {1} 处解析错误，完整的错误信息：\n"
+"\n"
+"{2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:50
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error, full error:\n"
+"\n"
+"{1}"
+msgstr ""
+"正则表示式 \"{0}\" 有解析错误，完整的错误信息：\n"
+"\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263
+msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
+msgstr "使用标签(tag)运算子时设定键不能空白。使用范例：key=value"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462
+#, java-format
+msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
+msgstr "不明的原型类型：{0}。允许的数值为node、 way 或relation"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:644
+#, java-format
+msgid "Unexpected token. Expected {0}, found {1}"
+msgstr "未预期的记号。应该为{0}，却发现{1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
+#, java-format
+msgid "Unexpected token: {0}"
+msgstr "未预期的记号：{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
+msgid "Missing parameter for OR"
+msgstr "缺少 OR 的参数"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
+msgid "Missing operator for NOT"
+msgstr "缺少 NOT 的运算子"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
+msgid "Primitive id expected"
+msgstr "预期的原型 id"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+msgid "Range of numbers expected"
+msgstr "预期的数字范围"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
+msgid "Changeset id expected"
+msgstr "预期的更改组合 id"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712
+msgid "Version expected"
+msgstr "预期的版本"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgstr "警告：自动截短在已删除对象 {1} 上标签 \"{0}\" 的数值"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"在对象 {1} 的标签 \"{0}\" 值的长度超过了最大值，允许的长度为 {2}。值的长度为 "
+"{3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70
+msgid "Precondition Violation"
+msgstr "违反先决条件"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "路径{1} 中的{0} 个节点超过最大值。允许的节点数为{2} 个"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "API Capabilities Violation"
+msgstr "违反 API 能力"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr "在关系间有循环相依性："
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"cannot upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+"<html>{0} 关系形成一个循环，因为它们互相参照对方。<br>JOSM 不能上传它们。请编"
+"辑这个关系并删除掉这个循环相依性。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr "关系..."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr "... 参照到关系"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr "循环相依性"
+
+#. Strings in JFileChooser
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
+#: build/specialmessages.java:58
+msgid "OK"
+msgstr "确定"
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65
+#, java-format
+msgid "Add node {0}"
+msgstr "加入节点 {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
+#, java-format
+msgid "Add way {0}"
+msgstr "加入路径 {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
+#, java-format
+msgid "Add relation {0}"
+msgstr "加入关系 {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:58
+#, java-format
+msgid "Added {0} object"
+msgid_plural "Added {0} objects"
+msgstr[0] "已加入 {0} 个对象"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:55
+#, java-format
+msgid "Change node {0}"
+msgstr "改变节点 {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:56
+#, java-format
+msgid "Change way {0}"
+msgstr "改变路径 {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:57
+#, java-format
+msgid "Change relation {0}"
+msgstr "改变关系 {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeNodesCommand.java:49
+#, java-format
+msgid "Changed nodes of {0}"
+msgstr "{0} 已变更的节点"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101
+#, java-format
+msgid "Remove \"{0}\" for node ''{1}''"
+msgstr "从节点 \"{1}\" 删除 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+msgstr "从路径 \"{1}\" 删除 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr "从关系 \"{1}\" 删除 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#, java-format
+msgid "Set {0}={1} for node ''{2}''"
+msgstr "在节点 \"{2}\" 设定 {0}={1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#, java-format
+msgid "Set {0}={1} for way ''{2}''"
+msgstr "在路径 \"{2}\" 设定 {0}={1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr "在关系 \"{2}\" 设定 {0}={1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#, java-format
+msgid "Remove \"{0}\" for {1} objects"
+msgstr "从 {1} 对象删除 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#, java-format
+msgid "Set {0}={1} for {2} objects"
+msgstr "在 {2} 对象设定 {0}={1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:69
+#, java-format
+msgid "Change relation member role for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
+"conflict cannot be added.</html>"
+msgstr ""
+"<html>图层 \"{0}\" 已有冲突发生于原型<br> \"{1}\"。 <br>这个冲突不能被加入。"
+"</html>"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142
+msgid "Double conflict"
+msgstr "双重冲突"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52
+#, java-format
+msgid ""
+"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
+"primitive ''{1}''."
+msgstr "警告：图层 \"{0}\" 已不存在。不能删除原型 \"{1}\" 的冲突。"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:67
+#, java-format
+msgid "Add conflict for ''{0}''"
+msgstr "加入 \"{0}\" 冲突"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84
+#, java-format
+msgid ""
+"Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
+msgstr "无法取消指令 \"{0}\" ，因为图层 \"{1}\" 已不存在"
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:42
+#, java-format
+msgid "Resolve conflicts in coordinates in {0}"
+msgstr "解决坐标 {0} 里的冲突"
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:63
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:74
+msgid "Cannot resolve undecided conflict."
+msgstr "不能未决定的冲突"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
+msgid "At least one object to delete required, got empty collection"
+msgstr "至少要删除一个对象，却收到空白集合"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
+#, java-format
+msgid "Delete node {0}"
+msgstr "删除节点 {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
+#, java-format
+msgid "Delete way {0}"
+msgstr "删除路径 {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#, java-format
+msgid "Delete relation {0}"
+msgstr "删除关系 {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
+#, java-format
+msgid "Delete {0} object"
+msgid_plural "Delete {0} objects"
+msgstr[0] "删除 {0} 个对象"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
+#, java-format
+msgid "Delete {0} node"
+msgid_plural "Delete {0} nodes"
+msgstr[0] "删除 {0} 个节点"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
+#, java-format
+msgid "Delete {0} way"
+msgid_plural "Delete {0} ways"
+msgstr[0] "删除 {0} 个路径"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#, java-format
+msgid "Delete {0} relation"
+msgid_plural "Delete {0} relations"
+msgstr[0] "删除 {0} 个关系"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
+#, java-format
+msgid "Deleted ''{0}''"
+msgstr "已删除 \"{0}\""
+
+#. leave message in one tr() as there is a grammatical
+#. connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:465
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:347
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you do not see) "
+"might use them.<br>Do you really want to delete?"
+msgstr ""
+"您将要删除在下载的区域外的节点。<br>这样有时会发生问题，因为其他对象(您没有看"
+"到的)可能会使用它们。<br>确定要删除吗?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:473
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:496
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:356
+msgid "Delete confirmation"
+msgstr "删除动作确认"
+
+#. leave message in one tr() as there is a grammatical
+#. connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+msgid ""
+"You are about to delete incomplete objects.<br>This will cause problems "
+"because you don't see the real object.<br>Do you really want to delete?"
+msgstr ""
+"您即将删除不完整的对象。<br>这样会造成问题，因为您没有看到实际的对象。<br>您"
+"确定要删除吗?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr "解决 {0} 删除状态的冲突"
+
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:38
+#, java-format
+msgid "Set the ''modified'' flag for node {0}"
+msgstr "在关系 {0} 设定 \"modified\" 旗标"
+
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:39
+#, java-format
+msgid "Set the ''modified'' flag for way {0}"
+msgstr "在关系 {0} 设定 \"modified\" 旗标"
+
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:40
+#, java-format
+msgid "Set the ''modified'' flag for relation {0}"
+msgstr "在关系 {0} 设定 \"modified\" 旗标"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:130
+#, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "移动 {0} 个节点"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "清理的对象 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
+#, java-format
+msgid "Purged {0} object"
+msgid_plural "Purged {0} objects"
+msgstr[0] "已清除 {0} 个对象"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr "警告：将清除路径{0}，因为其节点数已低于2。目前为{1}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173
+#, java-format
+msgid "Removing reference from relation {0}"
+msgstr "从关系 {0} 删除参考"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:53
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "解决关系{0} 的成员清单的冲突"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:139
+#, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "旋转 {0} 个节点"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:93
+msgid "Sequence"
+msgstr "次序"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:64
+#, java-format
+msgid "Resolve {0} tag conflicts in node {1}"
+msgstr "解决在节点 {1} 的 {0} 标签冲突"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:65
+#, java-format
+msgid "Resolve {0} tag conflicts in way {1}"
+msgstr "解决在路径 {1} 的 {0} 标签冲突"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66
+#, java-format
+msgid "Resolve {0} tag conflicts in relation {1}"
+msgstr "解决在关系 {1} 的 {0} 标签冲突"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65
+#, java-format
+msgid "Undelete {0} primitive"
+msgid_plural "Undelete {0} primitives"
+msgstr[0] "取消删除 {0} 个原型"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:38
+#, java-format
+msgid "Resolve version conflict for node {0}"
+msgstr "节点 {0} 的调解冲突版本"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:39
+#, java-format
+msgid "Resolve version conflict for way {0}"
+msgstr "路径 {0} 的调解冲突版本"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflict for relation {0}"
+msgstr "关系 {0} 的调解冲突版本"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:49
+#, java-format
+msgid "Resolve conflicts in node list of way {0}"
+msgstr "解决路径{0} 节点清单中的版本冲突"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:66
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "主要数据组合不包含节点 {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "是否接受?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"在反转这条路径时，为了维持数据的一致性，建议下列对该路径的属性与其节点的变"
+"更。"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26
+msgid "Relation"
+msgstr "关系"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Old role"
+msgstr "旧的角色"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "New role"
+msgstr "新的角色"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "旧的设定键"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "旧的数值"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "新的设定键"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
+msgid "New value"
+msgstr "新的数值"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:50
+msgid "Apply selected changes"
+msgstr "应用选取的变更"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:51
+msgid "Do not apply changes"
+msgstr "不要应用变更"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:74
+msgid "Please select which property changes you want to apply."
+msgstr "请选择要接受的属性变更。"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:86
+msgid "Properties of "
+msgstr "属性 "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:113
+msgid "Roles in relations referring to"
+msgstr "关系中的角色参照到"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:134
+msgid "Automatic tag correction"
+msgstr "自动修正标签"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:71
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:75
+#, java-format
+msgid "Unable to create directory {0}, autosave will be disabled"
+msgstr "无法创建目录 {0}，自动保存将被禁用"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
+#, java-format
+msgid "Unable to create file {0}, other filename will be used"
+msgstr "无法创建目录 {0}，将使用其他文件名"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
+#, java-format
+msgid "IOError while creating file, autosave will be skipped: {0}"
+msgstr "创建文件时发生 IO 错误，将跳过自动保存：{0}"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
+#, java-format
+msgid "Unable to delete old backup file {0}"
+msgstr "无法删除旧的备份文件 {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
+#, java-format
+msgid "Error while creating backup of removed layer: {0}"
+msgstr "创建删除图层的备份时发生错误：{0}"
+
+#: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
+#, java-format
+msgid "Unable to read autosaved osm data ({0}) - {1}"
+msgstr "无法读取 OSM 自动保存的数据 ({0}) - {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:79
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:81
+#, java-format
+msgid "Illegal latitude value ''{0}''"
+msgstr "不合法的纬度数值 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:77
+#, java-format
+msgid "Illegal longitude value ''{0}''"
+msgstr "不合法的经度数值 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#, java-format
+msgid "Warning: failed to persist preferences to ''{0}''"
+msgstr "警告：将偏好设定固定为 \"{0}\" 失败"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "设定文件第 {0} 行格式不良"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
+"not a directory."
+msgstr "警告：初始化偏好设定失败。偏好设定目录 \"{0}\" 不是一个目录。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
+"not a directory.</html>"
+msgstr ""
+"<html>初始化偏好设定失败。<br>偏好设定目录 \"{0}\" 不是一个目录。</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences. Failed to create missing "
+"preference directory: {0}"
+msgstr "警告：初始化偏好设定失败。无法建立缺少的偏好设定目录：{0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Failed to create missing "
+"preference directory: {0}</html>"
+msgstr "<html>初始化偏好设定失败。<br>无法建立缺少的偏好设定目录：{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#, java-format
+msgid ""
+"Warning: Missing preference file ''{0}''. Creating a default preference file."
+msgstr "警告：缺少偏好设定文件 \"{0}\"。正在建立预设的偏好设定文件。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#, java-format
+msgid ""
+"Warning: Replacing existing preference file ''{0}'' with default preference "
+"file."
+msgstr "警告：以预设的偏好设定文件取代现有的偏好设定文件 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Failed to reset preference file "
+"to default: {0}</html>"
+msgstr "<html>初始化偏好设定失败。<br>无法将偏好设定重设为预设值：{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
+msgstr ""
+"<html>偏好设定文件有错误。<br>将旧的设定制作备份为<br>{0}<br> 并建立新的预设"
+"偏好设定文件。</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences.Failed to reset preference file to "
+"default: {0}"
+msgstr "警告：初始化偏好设定失败。无法将偏好设定重设为预设值：{0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "错误：在书签文件 \"{1}\" 中有未预期的行 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr "错误：书签文件 \"{2}\" 的 \"{1}\" 行有不合格的 double 数值 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "偏好设定保存于 {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "无法上传偏好设定。理由：{0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
+msgid "Could not load preferences from server."
+msgstr "无法从服务器载入偏好设定。"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr "错误：服务器的书签清单中有未预期的行 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr "错误：服务器的书签清单的 \"{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
+#, java-format
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "无法载入资源 \"{0}\" ，错误为{1}。"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:98
+#: ../core/src/org/openstreetmap/josm/data/Version.java:161
+msgid "UNKNOWN"
+msgstr "不明"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:112
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr "警告：在修订版文件中有未预期的 JOSM 版本号码，数值为 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:145
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr "警告：缺少修订版文件 \"/REVISION\"。"
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
+#, java-format
+msgid "Already registered a conflict for primitive ''{0}''."
+msgstr "已经注册原型 \"{0}\" 的冲突。"
+
+#. *
+#. * the decimal format 999.999
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
+msgid "Decimal Degrees"
+msgstr "十进位经纬度"
+
+#. *
+#. * the degrees/minutes/seconds format 9° 99" 99'
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
+
+#. *
+#. * coordinates East/North
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
+msgid "Projected Coordinates"
+msgstr "投影的坐标"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+msgctxt "compass"
+msgid "S"
+msgstr "南"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
+msgctxt "compass"
+msgid "N"
+msgstr "北"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
+msgctxt "compass"
+msgid "W"
+msgstr "西"
+
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
+msgctxt "compass"
+msgid "E"
+msgstr "东"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it is already included"
+msgstr "无法将原型 {0} 加入数据组合，因为它已在其中"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"error, it should be safe to continue in your work."
+msgstr ""
+"JOSM 预期在数据组合中会找到原型 [{0} {1}] 但却没有。请在http://josm."
+"openstreetmap.de 回复这个情况。这不是严重的错误，继续您的工作应是安全的。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:121
+#, java-format
+msgid "Missing merge target for way with id {0}"
+msgstr "缺少 id {0} 路径的合并目标"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
+#, java-format
+msgid "Missing merge target for object with id {0}"
+msgstr "缺少 id {0} 对象的合并目标"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
+#, java-format
+msgid "Missing merge target for node with id {0}"
+msgstr "缺少 id {0} 节点的合并目标"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
+#, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "缺少 id {0} 关系的合并目标"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
+#: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
+#: ../plugins/reverter/src/reverter/DataSetToCmd.java:47
+#, java-format
+msgid "Missing merge target of type {0} with id {1}"
+msgstr "缺少 id {1} 类型 {0} 的合并目标"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
+#, java-format
+msgid "ID > 0 expected. Got {0}."
+msgstr "预期 ID > 0。收到 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:458
+#, java-format
+msgid "Version > 0 expected. Got {0}."
+msgstr "预期版本 > 0。收到 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:544
+#, java-format
+msgid ""
+"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
+"{0}"
+msgstr "不能将更改组合 ID > 0 指派给新的原型。更改组合 ID 的数值为 {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:743
+msgid "A primitive with ID = 0 cannot be invisible."
+msgstr "ID = 0 的原型不能为不可视。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1339
+msgid ""
+"Cannot merge because either of the participating primitives is new and the "
+"other is not"
+msgstr "不能合并，因为参与的原型是新的但其他的却不是"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1341
+#, java-format
+msgid ""
+"Cannot merge primitives with different ids. This id is {0}, the other is {1}"
+msgstr "不能合并不同id 的原型。这个 id 是 {0}，另一个是 {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "节点"
+
+#. light cyan
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "路径"
+
+#. dark blue
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:184
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:384
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
+msgid "relation"
+msgid_plural "relations"
+msgstr[0] "关系"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+msgid ""
+"Tag collection cannot be applied to a primitive because there are keys with "
+"multiple values."
+msgstr "标签集无法应用到原型上，因为有键值含有多个数值。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:351
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
+msgstr "不能将节点 {0} 加入到不完整的路径 {1}。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
+#, java-format
+msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgstr "不能比较 ID \"{0}\" 和 ID \"{1}\" 的原型。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
+#, java-format
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
+msgstr "参数 \"{0}\" 不应使用范围 0..{1}，却收到 \"{2}\""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13
+msgid "inactive"
+msgstr "不使用"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+msgid "selected"
+msgstr "已选取"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
+msgid "Relation: selected"
+msgstr "关系：已选取"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
+msgid "Node: standard"
+msgstr "节点：标准"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
+msgid "Node: connection"
+msgstr "节点：连接"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18
+msgid "Node: tagged"
+msgstr "节点：已标签"
+
+#. teal
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21
+msgid "untagged way"
+msgstr "未上标签的路径"
+
+#. dark green
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
+msgid "incomplete way"
+msgstr "不完整的路径"
+
+#. darker blue
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
+msgid "background"
+msgstr "背景"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24
+msgid "highlight"
+msgstr "突显"
+
+#. lighteal
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:26
+msgid "untagged"
+msgstr "未上标签的"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27
+msgid "text"
+msgstr "文字"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:28
+msgid "areatext"
+msgstr "区域文字"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
+msgid "WGS84 Geographic"
+msgstr "WGS84 地理座标"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:101
+#, java-format
+msgid ""
+"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+"NTF<->RGF93 grid"
+msgstr "警告：无法开启资源 \"/data/{0}\" 的输入串流。不能载入 NTF<->RGF93 格线"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:138
+msgid "Lambert 4 Zones (France)"
+msgstr "兰勃特 4 区域 (法国)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:250
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:185
+#, java-format
+msgid "{0} ({1} to {2} degrees)"
+msgstr "{0} ({1} 到 {2} 度)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:253
+#, java-format
+msgid "{0} (Corsica)"
+msgstr "{0} (科西嘉岛)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:261
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+msgid "Lambert CC Zone"
+msgstr "兰勃特 CC 区"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133
+msgid "Lambert CC9 Zone (France)"
+msgstr "兰勃特 CC9 区 (法国)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+msgid "Lambert Zone (Estonia)"
+msgstr "兰勃特区 (爱沙尼亚)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37
+msgid "Mercator"
+msgstr "麦卡托投影"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
+msgid "PUWG (Poland)"
+msgstr "PUWG (波兰)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:106
+msgid "PUWG Zone"
+msgstr "PUWG 区"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
+msgid "PUWG 1992 (Poland)"
+msgstr "PUWG 1992 (波兰)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
+#, java-format
+msgid "PUWG 2000 Zone {0} (Poland)"
+msgstr "PUWG 2000 区 {0} (波兰)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+msgid "Swiss Grid (Switzerland)"
+msgstr "Swiss Grid (瑞士)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+msgid "UTM"
+msgstr "UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+msgid "UTM Zone"
+msgstr "UTM 区"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
+msgid "Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+msgid "Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+msgid "Martinique Fort Desaix 1952"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+msgid "Reunion RGR92"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29
+msgid "Guyane RGFG95"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
+msgid "UTM France (DOM)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
+msgid "UTM Geodesic system"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#, java-format
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr "<html>无法读取书签<br>\"{0}\"<br>错误为：{1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
+#, java-format
+msgid "<html>Could not write bookmark.<br>{0}</html>"
+msgstr "<html>无法写入书签。<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
+msgid "Do not show again (remembers choice)"
+msgstr "不要再显示(记住选择)"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:87
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:89
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:301
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
+#, java-format
+msgid " [id: {0}]"
+msgstr " [id: {0}]"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:103
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233
+msgid "incomplete"
+msgstr "不完整"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355
+msgid "highway"
+msgstr "公路"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
+#: build/trans_presets.java:3266
+msgid "railway"
+msgstr "铁路"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:142
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:357
+msgid "waterway"
+msgstr "航道"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:358
+msgid "landuse"
+msgstr "土地利用"
+
+#. note: length == 0 should no longer happen, but leave the bracket code
+#. nevertheless, who knows what future brings
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:363
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} 节点"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:174
+msgid "public transport"
+msgstr "大众运输"
+
+#. color tiger_data
+#. </rule>
+#.
+#. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
+#. <rule>
+#. <condition k="openGeoDB:type" v="Stadt"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Kreis"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Gemeinde"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Ort"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="District"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:location" v="locality"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--annotation tags -->
+#.
+#. <!--"work in progress" tags -->
+#.
+#. <rule>
+#. <condition k="building"/>
+#. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:179
+#: ../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:4357
+msgid "building"
+msgstr "建筑"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:223
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:412
+#, java-format
+msgid "{0} member"
+msgid_plural "{0} members"
+msgstr[0] "{0} 成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:249
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
+#, java-format
+msgid "Changeset {0}"
+msgstr "更改组合 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:76
+msgid "Precondition violation"
+msgstr "违反先决条件"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:104
+msgid "Security exception"
+msgstr "安全性例外"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:122
+msgid "Network exception"
+msgstr "网络例外"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:140
+msgid "IO Exception"
+msgstr "IO 例外"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:157
+msgid "Illegal Data"
+msgstr "无效的数据"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
+msgid "Internal Server Error"
+msgstr "内部服务器错误"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:206
+msgid "Bad Request"
+msgstr "错误的要求"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:222
+msgid "Not Found"
+msgstr "找不到"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
+msgid "Conflict"
+msgstr "冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+msgid "Authentication Failed"
+msgstr "验证失败"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+msgid "Authorisation Failed"
+msgstr "验证失败"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:293
+msgid "Client Time Out"
+msgstr "客户端逾时"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:309
+msgid "Communication with OSM server failed"
+msgstr "与 OSM 连接失败"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:325
+msgid "Authentication failed"
+msgstr "验证失败"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
+msgid "Unknown host"
+msgstr "不明的主机"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:461
+msgid "Object deleted"
+msgstr "对象已删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
+msgid "Show help information"
+msgstr "显示帮助信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:70
+msgid "Message of the day not available"
+msgstr "无法取得当天的信息。"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:104
+msgid "Downloading \"Message of the day\""
+msgstr "正在下载 \"当天的信息\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+msgid "Click to close the dialog"
+msgstr "点击以关闭对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:104
+#, java-format
+msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
+msgstr "参数 \"{0}\" 应为非空的数值，却收到 \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
+msgid "Upload Preferences"
+msgstr "上传偏好设定"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+msgid "Upload the current preferences to the server"
+msgstr "将目前的偏好设定上传到服务器"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+msgid "string"
+msgstr "字串"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+msgid "Name of the user."
+msgstr "使用者的名称。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+msgid "OSM Password."
+msgstr "OSM 密码。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr "将小程序重设为指定的大小(格式：宽x高)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
+msgid "string;string;..."
+msgstr "字串;字串;..."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+msgid ""
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
+"filename"
+msgstr "下载每样。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的URL 或文件名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+msgid ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
+"lat=y&lon=x&zoom=z or a filename"
+msgstr ""
+"下载每样当作原始 gps。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的URL 或文"
+"件名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
+msgid ""
+"Add each to the initial selection. Can be a google-like search string or an "
+"URL which returns osm-xml"
+msgstr ""
+"加入每一样到初始选择区域。可以是 google 式查找字串或以 osm-xml 传回的 URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
+msgid "any"
+msgstr "任何"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
+msgid "If specified, reset the configuration instead of reading it."
+msgstr "如果指定，会重设组态而非读取它。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
+msgid "Username"
+msgstr "使用者名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
+msgid "Password"
+msgstr "密码"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+msgid "usage"
+msgstr "用法"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+msgid "options"
+msgstr "选项"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+msgid "Show this help"
+msgstr "显示此说明信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+msgid "Standard unix geometry argument"
+msgstr "标准 unix 几何引数"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+msgid "Download the bounding box"
+msgstr "下载此绑定方块"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr "于此 url 下载位置(具有 lat=x&lon=y&zoom=z)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+msgid "Open a file (any file type that can be opened with File/Open)"
+msgstr "开启文件(任何可以使用文件/开启来开启的文件类型)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+msgid "Download the bounding box as raw gps"
+msgstr "下载绑定方块做为原始 gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
+msgstr "将url (lat=x&lon=y&zoom=z) 的位置下载为原始 gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+msgid "Select with the given search"
+msgstr "选取指定的查找"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+msgid "Launch in maximized mode"
+msgstr "以最大化模式启动"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+msgid "Reset the preferences to default"
+msgstr "重设偏好设定为预设值"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+msgid "Set the language"
+msgstr "设定语言"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+msgid "options provided as Java system properties"
+msgstr "选项提供为 Java 系统属性"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+msgid "/PATH/TO/JOSM/FOLDER/         "
+msgstr "/PATH/TO/JOSM/FOLDER/         "
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+msgid "Change the folder for all user settings"
+msgstr "改变所有使用者设定值的文件夹"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+msgid ""
+"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
+"the following\n"
+"      Java option to specify the maximum size of allocated memory in "
+"megabytes"
+msgstr ""
+"注意：在某些工作中，JOSM 需要大量的内存。因此有必要加入下列\n"
+"      Java 选项以 MB 来指定分配到内存的最大容量"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+msgid "examples"
+msgstr "范例"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+msgid ""
+"Parameters --download, --downloadgps, and --selection are processed in this "
+"order."
+msgstr "参数--download、 --downloadgps 和--selection 会以这个顺序处理。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+msgid "Make sure you load some data if you use --selection."
+msgstr "如果您使用--selection 请确定已载入某些数据。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+msgid "Initializing"
+msgstr "初始化"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+msgid "Updating plugins..."
+msgstr "正在更新插件..."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+msgid "Installing updated plugins"
+msgstr "正在安装更新的插件"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+msgid "Loading early plugins"
+msgstr "载入较早的插件"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+msgid "Setting defaults"
+msgstr "设定预设值"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+msgid "Creating main GUI"
+msgstr "建立主视窗中"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+msgid "Loading plugins"
+msgstr "正在载入插件"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+msgid "Unsaved osm data"
+msgstr "未保存的 OSM 数据"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+msgid "Restore"
+msgstr "恢复"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#, java-format
+msgid ""
+"JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last "
+"time. Do you want to restore data?"
+msgstr ""
+"JOSM 发现 {0} 个未保存的 OSM 数据图层。它看上去像是 JOSM 上一次崩溃时留下的。"
+"你想恢复数据吗?"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr "偏好设定 {0} 已经被删除，因为它已不再使用了。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+msgid "File"
+msgstr "文件"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:485
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:675
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:55
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
+msgid "Edit"
+msgstr "编辑"
+
+#. Strings in JFileChooser
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: build/specialmessages.java:76
+msgid "View"
+msgstr "检视"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
+#: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
+msgid "Tools"
+msgstr "工具"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
+msgid "Presets"
+msgstr "预设组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
+#, java-format
+msgid "Menu: {0}"
+msgstr "菜单：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+msgid "Audio"
+msgstr "音效"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+msgid "Move right"
+msgstr "右移"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
+#, java-format
+msgid "Map: {0}"
+msgstr "地图：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+msgid "Move left"
+msgstr "左移"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:193
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:202
+msgid "Move up"
+msgstr "上移"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:166
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:176
+msgid "Move down"
+msgstr "下移"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+msgid "Zoom in"
+msgstr "放大"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
+msgid "Zoom out"
+msgstr "缩小"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
+msgid "scale"
+msgstr "缩放"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+msgid "The geographic longitude at the mouse pointer."
+msgstr "鼠标指标所在的地理经度。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+msgid "The name of the object at the mouse pointer."
+msgstr "鼠标指标所在的对象名称。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+msgid "The geographic latitude at the mouse pointer."
+msgstr "鼠标指标所在的地理纬度。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+msgid "The angle between the previous and the current way segment."
+msgstr "前一个路径区段与目前区段之间的角度。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+msgid "The (compass) heading of the line segment being drawn."
+msgstr "绘出线段的(指南针)箭头。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+msgid "The length of the new way segment being drawn."
+msgstr "绘出新的路径区段的长度。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr "按鼠标中键可以进行循环。<br>按住CTRL 可以用鼠标直接从清单中选择。<hr>"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
+msgid "(no object)"
+msgstr "(没有对象)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
+msgid "User:"
+msgstr "使用者："
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:389
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
+msgid "Layer not in list."
+msgstr "图层不在清单中。"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:695
+#, java-format
+msgid "Layer ''{0}'' must be in list of layers"
+msgstr "图层 \"{0}\" 必须在图层的清单中"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "数字"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "中式"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "商业"
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+msgid "Click to cancel the current operation"
+msgstr "点击以取消目前的操作"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
+msgid "false: the property is explicitly switched off"
+msgstr "false：该属性已经被确实关上了"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:91
+msgid "true: the property is explicitly switched on"
+msgstr "true：该属性已经被确实开启了"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr "部分：不同选取的对象有不同的数值，不要改变"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
+msgid "unset: do not set this property on the selected objects"
+msgstr "取消设定：不要在选取的对象上设定这个属性"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150
+msgid ""
+"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
+"relation</strong>.</html>"
+msgstr ""
+"<html>请确认是否从<strong>1 个关系</strong>中删除<strong>1 个对象</strong>。"
+"</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154
+#, java-format
+msgid ""
+"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
+"relations</strong>.</html>"
+msgstr ""
+"<html>请确认是否从<strong>{0} 个关系</strong>中删除<strong>1 个对象</"
+"strong>。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
+#, java-format
+msgid ""
+"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
+"relations</strong>.</html>"
+msgstr ""
+"<html>请确认是否从<strong>{1} 个关系</strong>中删除<strong>{0} 个对象</"
+"strong>。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165
+#, java-format
+msgid "Deleting {0} object"
+msgid_plural "Deleting {0} objects"
+msgstr[0] "正在删除 {0} 个对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167
+msgid "Delete objects"
+msgstr "正在删除对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310
+msgid "To delete"
+msgstr "要删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319
+msgid "From Relation"
+msgstr "从关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
+msgid "Pos."
+msgstr ""
+
+#. the role column
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java:20
+msgid "Role"
+msgstr "角色"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352
+msgid "Click to close the dialog and remove the object from the relations"
+msgstr "点击以关闭此对话框并从关系中删除此对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365
+msgid "Click to close the dialog and to abort deleting the objects"
+msgstr "点击以关闭此对话框并放弃删除此对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+msgid ""
+"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
+"level.</html>"
+msgstr ""
+"<html>请以指定的缩放等级选择一个<strong> OSM 拼贴的范围</strong>。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+msgid "Zoom level:"
+msgstr "缩放等级："
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+msgid "from tile"
+msgstr "从拼贴"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+msgid "up to tile"
+msgstr "到拼贴"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+msgid ""
+"<html>Alternatively you may enter a <strong>tile address</strong> for a "
+"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+msgid "Tile address:"
+msgstr "拼贴位址："
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+msgid "Apply the tile address"
+msgstr "应用这个拼贴位址"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+msgid "Please enter a tile address"
+msgstr "请输入拼贴位址"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+msgid "The current value isn''t a valid tile address"
+msgstr "目前的数值不是有效的拼贴位址"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+msgid "Please enter a tile index"
+msgstr "请输入拼贴索引"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+msgid "The current value isn''t a valid tile index for the given zoom level"
+msgstr "目前的数值在指定的缩放等级中是无法使用的拼贴索引"
+
+#. *
+#. * compare my version of an {@see OsmPrimitive} with their version
+#.
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
+msgid "My with Their"
+msgstr "我的与他们的"
+
+#. *
+#. * compare my version of an {@see OsmPrimitive} with the merged version
+#.
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
+msgid "My with Merged"
+msgstr "我的与合并的"
+
+#. *
+#. * compare their version of an {@see OsmPrimitive} with the merged veresion
+#.
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
+msgid "Their with Merged"
+msgstr "他们的与合并的"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
+#, java-format
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "角色 {0} 没有参与比较配对 {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
+msgid "Properties"
+msgstr "属性"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:192
+msgid "Tags"
+msgstr "标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
+msgid "Nodes"
+msgstr "节点"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
+msgid "Members"
+msgstr "成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
+msgid "No pending tag conflicts to be resolved"
+msgstr "没有待解决的标签冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
+#, java-format
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "标签({0} 冲突)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
+#, java-format
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "{0} 个标签冲突等待调解"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
+msgid "Nodes(resolved)"
+msgstr "节点(已解决)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr "合并的节点清单已冻结。这个路径的节点清单中没有待解决的冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
+msgid "Nodes(with conflicts)"
+msgstr "节点(有冲突)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
+msgid "Pending conflicts in the node list of this way"
+msgstr "这个路径的节点清单中待解决的冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
+msgid "Members(resolved)"
+msgstr "成员(已解决)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr "合并的节点清单已冻结。这个关系的成员清单中没有待解决的冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
+msgid "Members(with conflicts)"
+msgstr "成员(有冲突)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
+msgid "Pending conflicts in the member list of this relation"
+msgstr "这个关系的成员清单中待解决的冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
+msgid "No pending property conflicts"
+msgstr "没有待解决的冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
+msgid "Properties(with conflicts)"
+msgstr "属性(有冲突)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
+msgid "Pending property conflicts to be resolved"
+msgstr "待解决的属性冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284
+msgid "Conflict Resolution"
+msgstr "冲突的决议"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321
+#, java-format
+msgid "{0} more..."
+msgstr "还有 {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+msgid ""
+"The following primitives could not be copied to the target "
+"primitive<br>because they are deleted in the target dataset:"
+msgstr "下列原型无法复制到目标原型，<br>因为它们已经在目标数据组合中被删除了："
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335
+msgid "Merging deleted primitives failed"
+msgstr "合并删除的原型失败"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:652
+#, java-format
+msgid "List in role {0} is currently not participating in a compare pair."
+msgstr "角色 {0} 中的清单目前没有参与比较配对"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:801
+#, java-format
+msgid "Unexpected value of parameter ''index''. Got {0}."
+msgstr "参数 \"index\" 有未预期的数值。得到 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:815
+#, java-format
+msgid "Item {0} not found in list."
+msgstr "在清单中找不到项目 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:237
+msgid "lock scrolling"
+msgstr "锁定卷动"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:245
+msgid "Compare "
+msgstr "比较 "
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81
+msgid "My version"
+msgstr "我的版本"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:281
+msgid "List of elements in my dataset, i.e. the local dataset"
+msgstr "我的数据组合里元件的清单，例如本地数据组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
+msgid "Merged version"
+msgstr "合并的版本"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:287
+msgid ""
+"List of merged elements. They will replace the my elements when the merge "
+"decisions are applied."
+msgstr "合并元件的清单。它们会在合并决定被接受时取代我的元件。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
+msgid "Their version"
+msgstr "他们的版本"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:293
+msgid "List of elements in their dataset, i.e. the server dataset"
+msgstr "他们的数据组合里元件的清单，例如服务器数据组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:425
+msgid "> top"
+msgstr "> 顶端"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:427
+msgid "Copy my selected nodes to the start of the merged node list"
+msgstr "将我选取的节点复制到合并节点清单的开头"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:452
+msgid "> bottom"
+msgstr "> 底部"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:454
+msgid "Copy my selected elements to the end of the list of merged elements."
+msgstr "将我选取的元件复制到合并元件清单的结尾"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:481
+msgid ""
+"Copy my selected elements before the first selected element in the list of "
+"merged elements."
+msgstr "将我选取的元件复制到合并元件清单的第一个选取元件之前"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:515
+msgid ""
+"Copy my selected elements after the first selected element in the list of "
+"merged elements."
+msgstr "将我选取的元件复制到合并元件清单的第一个选取元件之后"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:544
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
+msgstr "将他们选取的元件复制到合并元件清单的开头"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
+msgid "Copy their selected elements to the end of the list of merged elements."
+msgstr "将他们选取的元件复制到合并元件清单的结尾"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:588
+msgid ""
+"Copy their selected elements before the first selected element in the list "
+"of merged elements."
+msgstr "将他们选取的元件复制到合并元件清单的第一个选取元件之前"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:617
+msgid ""
+"Copy their selected element after the first selected element in the list of "
+"merged elements"
+msgstr "将他们选取的元件复制到合并元件清单的第一个选取元件之后"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643
+msgid "Copy all my elements to the target"
+msgstr "将我所有的元素复制到目标"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:669
+msgid "Copy all their elements to the target"
+msgstr "将他们所有的元素复制到目标"
+
+#. Strings in JFileChooser
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
+#: build/specialmessages.java:72
+msgid "Up"
+msgstr "上"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
+msgid "Move up the selected elements by one position."
+msgstr "将选取的元件向上移动一个位置"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+msgid "Down"
+msgstr "下"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:730
+msgid "Move down the selected entries by one position."
+msgstr "将选取的项目向下移动一个位置"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:464
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:654
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:154
+msgid "Remove"
+msgstr "删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:762
+msgid "Remove the selected entries from the list of merged elements."
+msgstr "从合并元件的清单删除选取的项目"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:791
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:828
+msgid "Freeze"
+msgstr "冻结"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:792
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:829
+msgid "Freeze the current list of merged elements."
+msgstr "冻结合并元件目前的清单"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:824
+msgid "Unfreeze"
+msgstr "解除冻结"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:825
+msgid "Unfreeze the list of merged elements and start merging."
+msgstr "将合并元件的清单解除冻结并开始合并"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:850
+#, java-format
+msgid ""
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
+msgstr "<html>点击<strong>{0}</strong> 开始合并我和他们的项目</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:855
+#, java-format
+msgid ""
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
+msgstr "<html>点击<strong>{0}</strong> 结束合并我和他们的项目</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873
+#, java-format
+msgid "My version ({0} entry)"
+msgid_plural "My version ({0} entries)"
+msgstr[0] "我的版本 ({0} 个项目)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:876
+#, java-format
+msgid "Merged version ({0} entry)"
+msgid_plural "Merged version ({0} entries)"
+msgstr[0] "合并的版本 ({0} 个项目)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:879
+#, java-format
+msgid "Their version ({0} entry)"
+msgid_plural "Their version ({0} entries)"
+msgstr[0] "他们的版本 ({0} 个项目)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:942
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
+#, java-format
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr "可调整的{0} 尚未设定。不能在同步调整中设定参与。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:957
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94
+#, java-format
+msgid "Adjustable {0} not registered yet."
+msgstr "可调整的 {0} 尚未注册。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
+msgid "Node"
+msgstr "节点"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
+msgid "Merged nodes not frozen yet. Cannot build resolution command."
+msgstr "合并的节点尚未冻结。不能建置决议指令"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "我的数据组合的属性，例如本地数据组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr "合并元件的属性。当合并的决定被接受时它们会取代我的元件中的属性。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "他们的数据组合的属性，例如服务器数据组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110
+msgid "Coordinates:"
+msgstr "坐标："
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184
+msgid "Deleted State:"
+msgstr "删除的状态："
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260
+msgid "Referenced by:"
+msgstr "参照于："
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
+msgid "(none)"
+msgstr "(没有)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
+msgid "deleted"
+msgstr "已删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311
+msgid "not deleted"
+msgstr "未删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
+msgid "Keep my coordiates"
+msgstr "保留我的坐标"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
+msgid "Keep their coordiates"
+msgstr "保留他们的坐标"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430
+msgid "Undecide conflict between different coordinates"
+msgstr "在不同的坐标之间未解决的冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445
+msgid "Keep my deleted state"
+msgstr "保留我的删除状态"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460
+msgid "Keep their deleted state"
+msgstr "保留他们的删除状态"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475
+msgid "Undecide conflict between deleted state"
+msgstr "已删除状态之间未解决的冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26
+msgid "Primitive"
+msgstr "原型"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121
+msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgstr "合并的节点尚未冻结。不能建置决议指令"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59
+msgid "<undefined>"
+msgstr "<未定义的>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56
+#, java-format
+msgid "The merged dataset will not include a tag with key {0}"
+msgstr "合并的数据组合将不会包含设定键{0} 的标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
+#, java-format
+msgid "My dataset does not include a tag with key {0}"
+msgstr "我的数据组合并未包含设定键{0} 的标签"
+
+#. setting up the properties table
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
+msgid "Key"
+msgstr "设定键"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:474
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:516
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
+msgid "Value"
+msgstr "数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:99
+msgid "Cannot apply undecided tag merge item."
+msgstr "不能接受未决定的标签合并项目"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129
+msgid "My version (local dataset)"
+msgstr "我的版本(本地数据组合)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152
+msgid "Their version (server dataset)"
+msgstr "他们的版本(服务器数据组合)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275
+msgid "Keep the selected key/value pairs from the local dataset"
+msgstr "保留本地数据组合中选取的设定键/数值配对"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305
+msgid "Keep the selected key/value pairs from the server dataset"
+msgstr "保留服务器数据组合中选取的设定键/数值配对"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398
+msgid "Undecide"
+msgstr "未决定"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400
+msgid "Mark the selected tags as undecided"
+msgstr "将选取的标签标记为未决定"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
+#, java-format
+msgid "Their dataset does not include a tag with key {0}"
+msgstr "他们的数据组合并未包含设定键{0} 的标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:131
+msgid "Conflicts when combining primitives"
+msgstr "组合原型时发生冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:135
+#, java-format
+msgid "Conflicts when combining ways - combined way is ''{0}''"
+msgstr "组合路径时发生冲突- 组合的路径为 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:140
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr "在合并节点时发生冲突- 目标节点为 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282
+msgid "No conflicts to resolve"
+msgstr "没有待解决的冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
+msgid "Cancel conflict resolution"
+msgstr "取消冲突调解"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:284
+msgid "Apply resolved conflicts"
+msgstr "接受已调解的冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643
+msgid "Apply"
+msgstr "接受"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:227
+msgid "none"
+msgstr "没有"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
+#: build/trans_presets.java:2335
+msgid "all"
+msgstr "全部"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66
+msgid "Choose a value"
+msgstr "请选择数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68
+msgid "Please decide which values to keep"
+msgstr "请决定要保留的数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73
+#, java-format
+msgid "Value ''{0}'' is going to be applied for key ''{1}''"
+msgstr "数值 \"{0}\" 即将接受键值 \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79
+#, java-format
+msgid "The key ''{0}'' and all its values are going to be removed"
+msgstr "键值 \"{0}\" 和它所有的数值都会删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84
+#, java-format
+msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
+msgstr "所有加入 \"{0}\" 的数值都将接受键值 \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:100
+#, java-format
+msgid "Tag collection does not include the selected value ''{0}''."
+msgstr "标签集合不包含选取的数值 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:212
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:267
+msgid "Not decided yet."
+msgstr "尚未决定。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
+msgid "Tags from nodes"
+msgstr "节点的标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
+msgid "Tags from ways"
+msgstr "路径的标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
+msgid "Tags from relations"
+msgstr "关系的标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
+msgid "Conflicts in pasted tags"
+msgstr "冲突发生于粘贴的标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:370
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392
+msgid "Paste ..."
+msgstr "粘贴 ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392
+msgid "From ..."
+msgstr "从 ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:384
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:392
+msgid "To ..."
+msgstr "到 ..."
+
+#. minimum size is relevant for multisplit layout
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:441
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:498
+#, java-format
+msgid "{0} tag"
+msgid_plural "{0} tags"
+msgstr[0] "{0} 标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
+#, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} 路径"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "{0} 关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "Position {0} is out of range. Current number of members is {1}."
+msgstr "位置 {0} 超出范围。目前的成员数为 {1}。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:29
+msgid "Remove this relation member from the relation"
+msgstr "从关系中删除这个关系成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
+msgid "Keep"
+msgstr "保留"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
+msgid "Keep this relation member for the target object"
+msgstr "保留目标对象的这个关系成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Undecided"
+msgstr "未决定"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+msgid "Not decided yet"
+msgstr "尚未决定"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+msgid "Role:"
+msgstr "角色："
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+msgid "Enter a role for all relation memberships"
+msgstr "输入所有关系成员的角色"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+msgid "Tag modified relations with "
+msgstr "标签修改的关系为 "
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+msgid ""
+"<html>Select to enable entering a tag which will be applied<br>to all "
+"modified relations.</html>"
+msgstr "<html>选择以启用输入一个标签可应用到<br>所有修改的关系。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+msgctxt "tag"
+msgid "Key:"
+msgstr "键值："
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>输入标签键值，例如 <strong><tt>fixme</tt></strong></html>"
+
+#. Strings in GTK ColorChooser
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
+#: build/specialmessages.java:85
+msgid "Value:"
+msgstr "数值："
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>输入标签数值，例如 <strong><tt>check members</tt></strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+msgid ""
+"<html>The combined ways are members in one ore more relations. Please decide "
+"whether you want to <strong>keep</strong> these memberships for the combined "
+"way or whether you want to <strong>remove</strong> them.<br>The default is "
+"to <strong>keep</strong> the first way and <strong>remove</strong> the other "
+"ways that are members of the same relation: the combined way will take the "
+"place of the original way in the relation.</html>"
+msgstr ""
+"<html>组合的路径是一或多个关系的成员。请决定您要<strong>保留</strong>组合路径"
+"的这些成员或是<strong>删除</strong>它们。<br>预设值是<strong>保留</strong>第"
+"一条路径并<strong>删除</strong>相同关系中其他路径的成员资格：组合后的路径会取"
+"代关系中原本的路径。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether you want to <strong>keep</strong> these memberships for the target "
+"node or whether you want to <strong>remove</strong> them.<br>The default is "
+"to <strong>keep</strong> the first node and <strong>remove</strong> the "
+"other nodes that are members of the same relation: the target node will take "
+"the place of the original node in the relation.</html>"
+msgstr ""
+"<html>组合的路径是一或多个关系的成员。请决定您要<strong>保留</strong>组合路径"
+"的这些成员或是<strong>删除</strong>它们。<br>预设值是<strong>保留</strong>第"
+"一条路径并<strong>删除</strong>相同关系中其他路径的成员资格：组合后的路径会取"
+"代关系中原本的路径。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+msgid "Apply this role to all members"
+msgstr "将这个角色应用到所有成员中"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
+msgid "Orig. Way"
+msgstr "原路径"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
+msgid "Decision"
+msgstr "决定"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:43
+msgid "<html>Please select the values to keep for the following tags.</html>"
+msgstr "<html>请选择下列标签要保留的数值。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
+msgid "Show tags with conflicts only"
+msgstr "只显示有冲突的标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:49
+msgid "Show tags with multiple values only"
+msgstr "只显示有多个数值的标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
+msgid "For selected objects only"
+msgstr "只用于选取的对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
+msgid ""
+"<html>Select to show changesets for the currently selected objects only."
+"<br>Unselect to show all changesets for objects in the current data layer.</"
+"html>"
+msgstr ""
+"<html>选择此项以显示目前选取对象的更改组合。<br>不选择此项则会显示目前数据图"
+"层中所有对象的更改组合。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+msgid "Changesets"
+msgstr "更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255
+msgid "Open the list of changesets in the current layer."
+msgstr "开启在目前图层中更改组合的清单。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300
+msgid "Select all objects assigned to the currently selected changesets"
+msgstr "选择所有在目前选取更改组合中指派的对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:393
+msgid "Download"
+msgstr "下载"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
+msgid "Download information about the selected changesets from the OSM server"
+msgstr "从OSM 服务器下载关于已选取更改组合的信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:385
+msgid "Closes the selected open changesets"
+msgstr "关闭选取的开放更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:416
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:190
+msgid "Show info"
+msgstr "显示信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:417
+msgid "Open a web page for each selected changeset"
+msgstr "开启每个已选取更改组合的网页"
+
+#. Strings in JFileChooser
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
+#: build/specialmessages.java:36
+msgid "Details"
+msgstr "详细数据"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:457
+msgid "Opens the Changeset Manager window for the selected changesets"
+msgstr "开启已选取更改组合的更改组合管理程序"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:236
+msgid "Command Stack"
+msgstr "指令堆叠"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74
+msgid "Open a list of all commands (undo buffer)."
+msgstr "开启所有指令的清单(复原缓冲区)。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
+#: ../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:534
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
+#, java-format
+msgid "Toggle: {0}"
+msgstr "切换：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:314
+msgid ""
+"Selects the objects that take part in this command (unless currently deleted)"
+msgstr "选择用在这个指令中的对象(除非目前已被删除)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:375
+msgid "Undo the selected and all later commands"
+msgstr "取消选取以及之后所有的指令"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:381
+msgid "Redo the selected and all earlier commands"
+msgstr "重复选取动作以及之后所有的指令"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+msgid "Resolve conflicts."
+msgstr "调解冲突。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
+#, java-format
+msgid "Conflicts: {0} unresolved"
+msgstr "冲突：{0} 未调解"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "解决"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr "开启上列清单所有选取的项目的合并对话框。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr "在地图上设定选取的元件为上列清单中选取的项目。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191
+msgid "Cancel conflict resolution and close the dialog"
+msgstr "取消冲突决议并关闭此对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224
+msgid "Apply resolved conflicts and close the dialog"
+msgstr "接受已解决的冲突并关闭此对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
+msgid "Apply Resolution"
+msgstr "应用解决方案"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237
+msgid "Close anyway"
+msgstr "强制关闭"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
+msgid "Continue resolving"
+msgstr "继续解决"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240
+#, java-format
+msgid ""
+"<html>You did not finish to merge the differences in this conflict."
+"<br>Conflict resolutions will not be applied unless all differences<br>are "
+"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
+"Already<br>resolved differences will not be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
+msgstr ""
+"<html>您尚未完成这个冲突中差异的合并。<br>冲突的调解只有在所有差异都<br>解决"
+"后才会应用。<br>请按 <strong>{0}</strong> 强制关闭路径。<strong>已经<br>解决"
+"的差异都不会应用。</strong><br>点击 <strong>{1}</strong> 则返回冲突调解。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248
+msgid "Conflict not resolved completely"
+msgstr "冲突尚未完全调解"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281
+msgid "Resolve conflicts"
+msgstr "解决冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283
+#, java-format
+msgid "Resolve conflicts for ''{0}''"
+msgstr "调解 \"{0}\" 的冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+msgid "Filter objects and hide/disable them."
+msgstr "过滤对象并隐藏/停用它们。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java: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
+msgid "Add"
+msgstr "加入"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+msgid "Add filter."
+msgstr "加入过滤条件。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
+msgid "Edit filter."
+msgstr "编辑过滤条件。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+msgid "Delete filter."
+msgstr "删除过滤条件。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122
+msgid "Move filter up."
+msgstr "将过滤条件上移。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+msgid "Move filter down."
+msgstr "将过滤条件下移。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147
+msgid "Enable filter"
+msgstr "启用过滤条件"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148
+msgid "Hide elements"
+msgstr "隐藏元素"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150
+msgid "Inverse filter"
+msgstr "反转过滤条件"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151
+msgid "Filter mode"
+msgstr "过滤条件模式"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden:{0} Disabled:{1}"
+msgstr "过滤隐藏：{0} 停用：{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
+msgid "Error in filter"
+msgstr "过滤器中的错误"
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+msgctxt "filter"
+msgid "E"
+msgstr "E"
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
+msgctxt "filter"
+msgid "H"
+msgstr "H"
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
+msgctxt "filter"
+msgid "Text"
+msgstr "文字"
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
+msgctxt "filter"
+msgid "I"
+msgstr "I"
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
+msgctxt "filter"
+msgid "M"
+msgstr "M"
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+msgctxt "filter"
+msgid "R"
+msgstr "R"
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+msgctxt "filter"
+msgid "A"
+msgstr "A"
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
+msgctxt "filter"
+msgid "D"
+msgstr "D"
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
+msgctxt "filter"
+msgid "F"
+msgstr "F"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
+msgid "<h2>Filter active</h2>"
+msgstr "<h2>过滤条件已使用</h2>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
+#, java-format
+msgid "<p><b>{0}</b> objects hidden"
+msgstr "<p><b>{0}</b> 对象已隐藏"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
+#, java-format
+msgid "<b>{0}</b> objects disabled"
+msgstr "<b>{0}</b> 对象已停用"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
+msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
+msgstr "</p><p>关闭过滤条件对话框以查看所有的对象。<p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
+#: ../plugins/reverter/src/reverter/ReverterPlugin.java:18
+msgid "History"
+msgstr "历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
+msgid "Display the history of all selected items."
+msgstr "显示所有选取的项目历史纪录。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:265
+msgid "Object with history"
+msgstr "有历史纪录的对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:530
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
+msgid "Reload"
+msgstr "重新载入"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "重新载入所有目前的对象并重新整理清单。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:322
+msgid "Show"
+msgstr "显示"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:323
+msgid "Display the history of the selected objects."
+msgstr "显示选取对象的历史纪录。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:43
+msgid "Advanced object info"
+msgstr "进阶的对象信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+msgid "Enter the coordinates for the new node."
+msgstr "输入新节点的座标"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+msgid "Use decimal degrees."
+msgstr "使用十进位度数"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
+msgid "Negative values denote Western/Southern hemisphere."
+msgstr "负数表示西半球/南半球"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
+msgid "Please enter a valid latitude in the range -90..90"
+msgstr "请输入有效的纬度范围 -90..90"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
+msgid "Please enter a latitude in the range -90..90"
+msgstr "请输入纬度范围 -90..90"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
+msgid "Please enter a valid longitude in the range -180..180"
+msgstr "请输入有效的经度范围 -180..180"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
+msgid "Please enter a longitude in the range -180..180"
+msgstr "请输入经度范围 -180..180"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
+msgid "Close the dialog and create a new node"
+msgstr "关闭此对话框并建立新的节点"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
+msgid "Close the dialog, do not create a new node"
+msgstr "关闭此对话框，不要建立新的节点"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
+msgid "Layers"
+msgstr "图层"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+msgid "Open a list of all loaded layers."
+msgstr "开启所有载入图层的清单。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
+msgid "Delete the selected layers."
+msgstr "删除选取的图层。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "切换选取的图层可见性状态。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
+msgid "Show/Hide"
+msgstr "显示/隐藏"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
+msgid "Activate"
+msgstr "使用"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
+msgid "Activate the selected layer"
+msgstr "使用选取的图层"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
+msgid "Merge this layer into another layer"
+msgstr "将这个图层合并至另一个图层"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+msgid "Duplicate this layer"
+msgstr "重制这个图层"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
+msgid "Move the selected layer one row up."
+msgstr "将选取的图层上移一列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
+msgid "Move the selected layer one row down."
+msgstr "将选取的图层下移一列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
+msgid "Information about layer"
+msgstr "关于图层的信息"
+
+#. item "Land use/Quarry" text "Name"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
+#: build/trans_presets.java:3212
+msgid "Relations"
+msgstr "关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
+msgid "Open a list of all relations."
+msgstr "开启所有关系的清单。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:279
+msgid "Open an editor for the selected relation"
+msgstr "开启选取的关系编辑器"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:320
+msgid "Delete the selected relation"
+msgstr "删除选取的关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:358
+msgid "Create a new relation"
+msgstr "建立新的关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr "建立这个关系的复本并且在另一个编辑器视窗开启它"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433
+msgid "Set the current selection to the list of selected relations"
+msgstr "将目前的选择区域设定到选取关系的清单"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
+msgid "Select the members of all selected relations"
+msgstr "选择所有已选取关系的成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:462
+msgid "Select members"
+msgstr "选择成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:492
+msgid "Download all members of the selected relations"
+msgstr "下载已选取关系的所有成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:493
+msgid "Download members"
+msgstr "下载成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846
+msgid "Download incomplete members of selected relations"
+msgstr "下载已选取关系的不完整成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848
+msgid "Download incomplete members"
+msgstr "下载不完整的成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:766
+#, java-format
+msgid "Relations: {0}"
+msgstr "关系：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
+msgid "Current Selection"
+msgstr "目前的选择区域"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166
+msgid "Open a selection list window."
+msgstr "开启选择区域清单视窗。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299
+msgid "Search for objects"
+msgstr "查找对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:354
+msgid "Zoom to selection"
+msgstr "缩放至选择区域"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:388
+msgid "Zoom to selected element(s)"
+msgstr "缩放至选取的元件"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:419
+msgid "Call editor for relation"
+msgstr "开启关系编辑器"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:420
+msgid "Call relation editor for selected relation"
+msgstr "开启选取关系的关系编辑器"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+msgid "Select in relation list"
+msgstr "在关系清单中选择"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+msgid "Select relation in relation list."
+msgstr "在关系清单中选择。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:497
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67
+msgid "Selection"
+msgstr "选择区域"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:508
+#, java-format
+msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
+msgstr "Sel.: Rel.:{0} / 路径:{1} / 节点:{2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811
+#, java-format
+msgid "Selection: {0}"
+msgstr "选择区域：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883
+msgid "Get detailed information on the internal state of the objects."
+msgstr "取得对象内部状态的详细信息。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884
+msgid "Inspect"
+msgstr "检查"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+msgid "Undock the panel"
+msgstr "解锁面板"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgstr "关闭这个面板。您可以用左侧工具列的按钮重新开启它。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+msgid "Click to minimize/maximize the panel content"
+msgstr "点击以最小化/最大化面板内容"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:143
+msgid "Authors"
+msgstr "作者"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
+msgid "Open a list of people working on the selected objects."
+msgstr "开启在编辑选取对象的使用者的清单。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
+#, java-format
+msgid "{0} Author"
+msgid_plural "{0} Authors"
+msgstr[0] "{0} 作者"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:160
+msgid "Select primitives submitted by this user"
+msgstr "选择由这个使用者提交的原型"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191
+msgid "Launches a browser with information about the user"
+msgstr "启动浏览器显示关于此使用者的信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:203
+#, java-format
+msgid ""
+"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgstr "警告：只会显示{1} 个已选取使用者的前{0} 位"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:226
+#, java-format
+msgid ""
+"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
+"this system.</html>"
+msgstr "<html>无法建立URL，因为编码 \"{0}\"<br>在这个系统中并不存在。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:228
+msgid "Missing encoding"
+msgstr "缺少编码"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278
+msgid "<new object>"
+msgstr "<新对象>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:291
+msgid "Author"
+msgstr "作者"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:291
+msgid "# Objects"
+msgstr "# 对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:179
+msgid "Display the basic properties of the changeset"
+msgstr "显示这个更改组合的基本属性"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:181
+msgid "Display the tags of the changeset"
+msgstr "显示这个更改组合的标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182
+msgid "Content"
+msgstr "内容"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183
+msgid "Display the objects created, updated, and deleted by the changeset"
+msgstr "显示由这个更改组合建立、更新和删除的对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:267
+msgid "Changeset Management Dialog"
+msgstr "更改组合管理对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:200
+msgid "Close the dialog"
+msgstr "关闭这个对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:163
+msgid "Query"
+msgstr "查询"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:358
+msgid "Launch the dialog for querying changesets"
+msgstr "执行对话框以查询更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:265
+msgid "Remove from cache"
+msgstr "从缓存中删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:383
+msgid "Remove the selected changesets from the local cache"
+msgstr "从本地缓存中删除选取的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:410
+msgid "Close the selected changesets"
+msgstr "关闭选取的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:323
+msgid "Update changeset"
+msgstr "更新更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
+msgid "Updates the selected changesets with current data from the OSM server"
+msgstr "以目前的数据更新OSM 服务器上选取的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
+msgid "Download changeset content"
+msgstr "下载更改组合内容"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477
+msgid "Download the content of the selected changesets from the server"
+msgstr "从服务器下载关于已选取更改组合的内容"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510
+msgid "My changesets"
+msgstr "我的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512
+msgid "Download my changesets from the OSM server (max. 100 changesets)"
+msgstr "从OSM 服务器下载我的更改组合(最多100 个更改组合)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
+msgid ""
+"<html>JOSM is currently running with an anonymous user. It cannot "
+"download<br>your changesets from the OSM server unless you enter your OSM "
+"user name<br>in the JOSM preferences.</html>"
+msgstr ""
+"<html>JOSM 目前是以匿名使用者执行。它无法从<br> OSM 服务器下载您的更改组合，"
+"除非在 JOSM 偏好设定<br>输入您的 OSM 使用者名称。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
+msgctxt "changeset.upload-comment"
+msgid "empty"
+msgstr "空的"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
+msgctxt "changeset.state"
+msgid "Open"
+msgstr "开启"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
+msgctxt "changeset.state"
+msgid "Closed"
+msgstr "已关闭"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:221
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+msgid "anonymous"
+msgstr "匿名"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:30
+msgid "Comment"
+msgstr "备注"
+
+#. Strings in JFileChooser
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38
+#: build/specialmessages.java:59
+msgid "Open"
+msgstr "开启"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
+msgid "User"
+msgstr "使用者"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54
+msgid "Created at"
+msgstr "建立于"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62
+msgid "Closed at"
+msgstr "关闭于"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:179
+msgid "Downloading changeset content"
+msgstr "下载更改组合内容"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:170
+#, java-format
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) 正在下载更改组合{2}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:177
+#, java-format
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) 正在下载更改组合{2} 的内容..."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:306
+msgid "Download content"
+msgstr "下载内容"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308
+msgid "Download the changeset content from the OSM server"
+msgstr "从OSM 服务器下载更改组合内容"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:310
+msgid "Update content"
+msgstr "更新内容"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:312
+msgid "Update the changeset content from the OSM server"
+msgstr "从OSM 服务器更新更改组合内容"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:248
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241
+msgid "Show history"
+msgstr "显示历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
+msgid "Download and show the history of the selected primitives"
+msgstr "下载并显示选取原型的历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:356
+msgid "Select in layer"
+msgstr "在图层中选择"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317
+msgid "Select the corresponding primitives in the current data layer"
+msgstr "选择在目前的数据图层中对应的原型"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:386
+#, java-format
+msgid ""
+"<html>The selected object is not available in the current<br>edit layer "
+"''{0}''.</html>"
+msgid_plural ""
+"<html>None of the selected objects is available in the current<br>edit layer "
+"''{0}''.</html>"
+msgstr[0] "<html>在目前编辑的图层 \"{0}\" 中没有选取的<br>对象可用。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:370
+msgid "Nothing to select"
+msgstr "没有可选择的"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:415
+msgid "Zoom to in layer"
+msgstr "拉近到图层"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
+msgid "Zoom to the corresponding primitives in the current data layer"
+msgstr "缩放到目前数据图层对应的原型"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:429
+msgid "Nothing to zoom to"
+msgstr "没有可缩放的"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+msgid "The content of this changeset is not downloaded yet."
+msgstr "这个更改组合的内容尚未下载。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+msgid "Download now"
+msgstr "立即下载"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+msgid "Download the changeset content"
+msgstr "立即下载更改组合内容"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50
+msgid "Created"
+msgstr "已建立"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51
+msgid "Updated"
+msgstr "已更新"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52
+msgid "Deleted"
+msgstr "已删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:32
+msgid "ID"
+msgstr "ID"
+
+#. Strings in JFileChooser
+#. item "Highways/Streets/Motorway" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Trunk" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Primary" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Secondary" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Tertiary" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
+#. <space />
+#. <key key="highway" value="unclassified" />
+#. <optional>
+#. item "Highways/Streets/Residential" label "Edit Residential Street"
+#. <space />
+#. <key key="highway" value="residential" />
+#. item "Highways/Streets/Living Street" label "Edit Living Street"
+#. <space />
+#. <key key="highway" value="living_street" />
+#. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
+#. <space />
+#. <key key="highway" value="pedestrian" />
+#. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
+#. <space />
+#. <key key="highway" value="road" />
+#. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
+#. item "Highways/Streets/Bridge" label "Edit Bridge"
+#. <space />
+#. <key key="bridge" value="yes" />
+#. <optional>
+#. item "Highways/Streets/Tunnel" label "Edit Tunnel"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel" />
+#. <space />
+#. <key key="tunnel" value="yes" />
+#. <optional>
+#. item "Ways/Track" label "Edit Track"
+#. <space />
+#. <key key="highway" value="track" />
+#. <optional>
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <optional>
+#. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
+#. <space />
+#. <key key="highway" value="bridleway" />
+#. <optional>
+#. item "Ways/Dedicated Cycleway" label "Edit Cycleway"
+#. <space />
+#. <key key="highway" value="cycleway" />
+#. <optional>
+#. item "Ways/Segregated Foot- and Cycleway" label "Edit Cycleway"
+#. <space />
+#. <key key="highway" value="path" />
+#. <key key="bicycle" value="designated" />
+#. <key key="foot" value="designated" />
+#. <key key="segregated" value="yes" />
+#. <optional>
+#. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
+#. <space />
+#. <key key="highway" value="path" />
+#. <key key="bicycle" value="designated" />
+#. <key key="foot" value="designated" />
+#. <key key="segregated" value="no" />
+#. <optional>
+#. item "Ways/Dedicated Footway" label "Edit Footway"
+#. <space />
+#. <key key="highway" value="footway" />
+#. <optional>
+#. item "Ways/Steps" label "Edit Flight of Steps"
+#. <space />
+#. <key key="highway" value="steps" />
+#. <optional>
+#. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
+#. <space />
+#. <key key="highway" value="motorway_junction" />
+#. item "Waypoints/Services" label "Edit Service Station"
+#. <space />
+#. <key key="highway" value="services" />
+#. <optional>
+#. item "Waypoints/City Limit" label "Edit City Limit Sign"
+#. <space />
+#. <key key="traffic_sign" value="city_limit" />
+#. <space />
+#. item "Waypoints/Ford" label "Edit Ford"
+#. <space />
+#. <key key="highway" value="ford" />
+#. <optional>
+#. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
+#. <space />
+#. <key key="mountain_pass" value="yes" />
+#. <optional>
+#. item "Barriers/Toll Booth" label "Edit Toll Booth"
+#. <space />
+#. <key key="barrier" value="toll_booth" />
+#. <optional>
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Drain" label "Edit Drain"
+#. <space />
+#. <key key="waterway" value="drain" />
+#. item "Water/Water/Ditch" label "Edit Ditch"
+#. <space />
+#. <key key="waterway" value="ditch" />
+#. item "Water/Water/Stream" label "Edit Stream"
+#. <space />
+#. <key key="waterway" value="stream" />
+#. item "Water/Water/Canal" label "Edit Canal"
+#. <space />
+#. <key key="waterway" value="canal" />
+#. item "Water/Water/River" label "Edit River"
+#. <space />
+#. <key key="waterway" value="river" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Basin" label "Edit Basin Landuse"
+#. <space />
+#. <key key="landuse" value="basin" />
+#. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
+#. <space />
+#. <key key="landuse" value="reservoir" />
+#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
+#. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Riverbank" label "Edit Riverbank"
+#. <key key="waterway" value="riverbank" />
+#. item "Water/Water/Wetland" label "Edit Wetland"
+#. <key key="natural" value="wetland" />
+#. item "Water/Water/Mud" label "Edit Mud"
+#. <key key="natural" value="mud" />
+#. item "Water/Water/Beach" label "Edit Beach"
+#. <key key="natural" value="beach" />
+#. item "Water/Water/Bay" label "Edit Bay"
+#. <key key="natural" value="bay" />
+#. item "Water/Water/Cliff" label "Edit Cliff"
+#. <key key="natural" value="cliff" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
+#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. <space />
+#. <key key="route" value="ferry" />
+#. <optional>
+#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. <space />
+#. <key key="waterway" value="boatyard" />
+#. item "Water/Water/Dock" label "Edit Dock"
+#. <space />
+#. <key key="waterway" value="dock" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
+#. item "Waterway Point/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Waterway Point/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Waterway Point/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Waterway Point/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Waterway Point/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
+#. <space />
+#. <key key="highway" value="bus_guideway" />
+#. <optional>
+#. item "Aerialway/Chair Lift" label "Edit Chair Lift"
+#. <key key="aerialway" value="chair_lift" />
+#. item "Aerialway/Drag Lift" label "Edit Drag Lift"
+#. <key key="aerialway" value="drag_lift" />
+#. item "Aerialway/Cable Car" label "Edit Cable Car"
+#. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
+#. item "Aerialway/Station" label "Edit Station"
+#. <key key="aerialway" value="station" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
+#. item "Car/Parking" label "Edit Parking"
+#. <key key="amenity" value="parking" />
+#. item "Car/Wash" label "Edit Car Wash"
+#. <key key="amenity" value="car_wash" />
+#. item "Car/Repair" label "Edit Car Repair"
+#. <key key="shop" value="car_repair" />
+#. item "Car/Rental" label "Edit Car Rental"
+#. <key key="amenity" value="car_rental" />
+#. item "Car/Sharing" label "Edit Car Sharing"
+#. <key key="amenity" value="car_sharing" />
+#. item "Bicycle/Parking" label "Edit Bicycle Parking"
+#. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Rental" label "Edit Bicycle Rental"
+#. <key key="amenity" value="bicycle_rental" />
+#. item "Public Transport/Station" label "Edit Station"
+#. <space />
+#. <key key="railway" value="station" />
+#. <optional>
+#. item "Public Transport/Railway Halt" label "Edit Halt"
+#. <space />
+#. <key key="railway" value="halt" />
+#. <optional>
+#. item "Public Transport/Tram Stop" label "Edit Tram Stop"
+#. <space />
+#. <key key="railway" value="tram_stop" />
+#. <optional>
+#. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
+#. <space />
+#. <key key="railway" value="subway_entrance" />
+#. <optional>
+#. item "Public Transport/Bus Station" label "Edit Bus Station"
+#. <key key="amenity" value="bus_station" />
+#. <optional>
+#. item "Public Transport/Bus Stop" label "Edit Bus Stop"
+#. <space />
+#. <key key="highway" value="bus_stop" />
+#. <optional>
+#. item "Public Transport/Taxi" label "Edit Taxi station"
+#. <key key="amenity" value="taxi" />
+#. item "Airport/Airport Ground" label "Edit Airport Ground"
+#. <key key="aeroway" value="aerodrome" />
+#. item "Airport/Terminal" label "Edit Terminal"
+#. <key key="aeroway" value="terminal" />
+#. item "Travel/Accomodation/Hotel" label "Edit Hotel"
+#. <key key="tourism" value="hotel" />
+#. item "Travel/Accomodation/Motel" label "Edit Motel"
+#. <key key="tourism" value="motel" />
+#. item "Travel/Accomodation/Guest House" label "Edit Guest House"
+#. <key key="tourism" value="guest_house" />
+#. item "Travel/Accomodation/Chalet" label "Edit Chalet"
+#. <key key="tourism" value="chalet" />
+#. item "Travel/Accomodation/Hostel" label "Edit Hostel"
+#. <key key="tourism" value="hostel" />
+#. item "Travel/Accomodation/Alpine Hut" label "Edit Alpine Hut"
+#. <key key="tourism" value="alpine_hut" />
+#. item "Travel/Accomodation/Caravan Site" label "Edit Caravan Site"
+#. <key key="tourism" value="caravan_site" />
+#. item "Travel/Accomodation/Camping Site" label "Edit Camping Site"
+#. <key key="tourism" value="camp_site" />
+#. item "Food+Drinks/Restaurant" label "Edit Restaurant"
+#. <key key="amenity" value="restaurant" />
+#. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
+#. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Cafe" label "Edit Cafe"
+#. <key key="amenity" value="cafe" />
+#. item "Food+Drinks/Pub" label "Edit Pub"
+#. <key key="amenity" value="pub" />
+#. item "Food+Drinks/Biergarten" label "Edit Biergarten"
+#. <key key="amenity" value="biergarten" />
+#. item "Food+Drinks/Bar" label "Edit Bar"
+#. <key key="amenity" value="bar" />
+#. item "Food+Drinks/Nightclub" label "Edit Nightclub"
+#. <key key="amenity" value="nightclub" />
+#. item "Tourism/Attraction" label "Edit Attraction"
+#. <key key="tourism" value="attraction" />
+#. item "Tourism/Museum" label "Edit Museum"
+#. <key key="tourism" value="museum" />
+#. item "Tourism/Zoo" label "Edit Zoo"
+#. <key key="tourism" value="zoo" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Theme Park" label "Edit Theme Park"
+#. <key key="tourism" value="theme_park" />
+#. item "Tourism/Artwork" label "Edit Artwork"
+#. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
+#. item "Tourism/Map"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="map" />
+#. item "Tourism/Information Board"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:information%3Dboard" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="board" />
+#. item "Tourism/Guidepost"
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="terminal" />
+#. item "Tourism/Audioguide"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="audioguide" />
+#. item "Tourism/Other Information Points"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
+#. <key key="tourism" value="information" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
+#. item "Historic Places/Castle" label "Edit Castle"
+#. <key key="historic" value="castle" />
+#. item "Historic Places/Ruins" label "Edit Ruins"
+#. <key key="historic" value="ruins" />
+#. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
+#. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
+#. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
+#. <key key="geological" value="palaeontological_site" />
+#. item "Historic Places/Monument" label "Edit Monument"
+#. <key key="historic" value="monument" />
+#. item "Historic Places/Memorial" label "Edit Memorial"
+#. <key key="historic" value="memorial" />
+#. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
+#. <key key="historic" value="wayside_cross" />
+#. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
+#. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
+#. item "Leisure/Water Park" label "Edit Water Park"
+#. <key key="leisure" value="water_park" />
+#. item "Leisure/Playground" label "Edit Playground"
+#. <key key="leisure" value="playground" />
+#. item "Leisure/Fishing" label "Edit Fishing"
+#. <key key="leisure" value="fishing" />
+#. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
+#. <key key="leisure" value="stadium" />
+#. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
+#. <key key="leisure" value="sports_centre" />
+#. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
+#. <key key="leisure" value="pitch" />
+#. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
+#. <key key="leisure" value="track" />
+#. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
+#. <key key="leisure" value="golf_course" />
+#. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
+#. <key key="leisure" value="miniature_golf" />
+#. item "Sport/Multi" label "Edit Multi"
+#. <key key="sport" value="multi" />
+#. item "Sport/10pin" label "Edit 10pin"
+#. <key key="sport" value="10pin" />
+#. item "Sport/Athletics" label "Edit Athletics"
+#. <key key="sport" value="athletics" />
+#. item "Sport/Archery" label "Edit Archery"
+#. <key key="sport" value="archery" />
+#. item "Sport/Climbing" label "Edit Climbing"
+#. <key key="sport" value="climbing" />
+#. item "Sport/Canoeing" label "Edit Canoeing"
+#. <key key="sport" value="canoe" />
+#. item "Sport/Cycling" label "Edit Cycling"
+#. <key key="sport" value="cycling" />
+#. item "Sport/Dog Racing" label "Edit Dog Racing"
+#. <key key="sport" value="dog_racing" />
+#. item "Sport/Equestrian" label "Edit Equestrian"
+#. <key key="sport" value="equestrian" />
+#. item "Sport/Horse Racing" label "Edit Horse Racing"
+#. <key key="sport" value="horse_racing" />
+#. item "Sport/Gymnastics" label "Edit Gymnastics"
+#. <key key="sport" value="gymnastics" />
+#. item "Sport/Motor Sports" label "Edit Motor Sports"
+#. <key key="sport" value="motor" />
+#. item "Sport/Skating" label "Edit Skating"
+#. <key key="sport" value="skating" />
+#. item "Sport/Skateboard" label "Edit Skateboard"
+#. <key key="sport" value="skateboard" />
+#. item "Sport/Swimming" label "Edit Swimming"
+#. <key key="sport" value="swimming" />
+#. item "Sport/Skiing" label "Edit Skiing"
+#. <key key="sport" value="skiing" />
+#. item "Sport/Shooting" label "Edit Shooting"
+#. <key key="sport" value="shooting" />
+#. item "Sport (Ball)/Soccer" label "Edit Soccer"
+#. <key key="sport" value="soccer" />
+#. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
+#. <key key="sport" value="australian_football" />
+#. item "Sport (Ball)/American Football" label "Edit American Football"
+#. <key key="sport" value="american_football" />
+#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
+#. <key key="sport" value="canadian_football" />
+#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
+#. <key key="sport" value="gaelic_football" />
+#. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
+#. <key key="sport" value="rugby_league" />
+#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
+#. <key key="sport" value="rugby_union" />
+#. item "Sport (Ball)/Baseball" label "Edit Baseball"
+#. <key key="sport" value="baseball" />
+#. item "Sport (Ball)/Basketball" label "Edit Basketball"
+#. <key key="sport" value="basketball" />
+#. item "Sport (Ball)/Golf" label "Edit Golf"
+#. <key key="sport" value="golf" />
+#. item "Sport (Ball)/Boule" label "Edit Boule"
+#. <key key="sport" value="boules" />
+#. item "Sport (Ball)/Bowls" label "Edit Bowls"
+#. <key key="sport" value="bowls" />
+#. item "Sport (Ball)/Cricket" label "Edit Cricket"
+#. <key key="sport" value="cricket" />
+#. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
+#. <key key="sport" value="cricket_nets" />
+#. item "Sport (Ball)/Croquet" label "Edit Croquet"
+#. <key key="sport" value="croquet" />
+#. item "Sport (Ball)/Hockey" label "Edit Hockey"
+#. <key key="sport" value="hockey" />
+#. item "Sport (Ball)/Pelota" label "Edit Pelota"
+#. <key key="sport" value="pelota" />
+#. item "Sport (Ball)/Racquet" label "Edit Racquet"
+#. <key key="sport" value="racquet" />
+#. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
+#. <key key="sport" value="table_tennis" />
+#. item "Sport (Ball)/Tennis" label "Edit Tennis"
+#. <key key="sport" value="tennis" />
+#. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
+#. <key key="amenity" value="public_building" />
+#. item "Man-Made/Buildings/Town hall" label "Edit Town hall"
+#. <key key="amenity" value="townhall" />
+#. item "Man-Made/Buildings/Embassy" label "Edit Embassy"
+#. <key key="amenity" value="embassy" />
+#. item "Man-Made/Buildings/Courthouse" label "Edit Courthouse"
+#. <key key="amenity" value="courthouse" />
+#. item "Man-Made/Buildings/Prison" label "Edit Prison"
+#. <key key="amenity" value="prison" />
+#. item "Man-Made/Buildings/Police" label "Edit Police"
+#. <key key="amenity" value="police" />
+#. item "Man-Made/Buildings/Fire Station" label "Edit Fire Station"
+#. <key key="amenity" value="fire_station" />
+#. item "Man-Made/Buildings/Post Office" label "Edit Post Office"
+#. <key key="amenity" value="post_office" />
+#. item "Man-Made/Buildings/Kindergarten" label "Edit Kindergarten"
+#. <key key="amenity" value="kindergarten" />
+#. item "Man-Made/Buildings/School" label "Edit School"
+#. <key key="amenity" value="school" />
+#. item "Man-Made/Buildings/University" label "Edit University"
+#. <key key="amenity" value="university" />
+#. item "Man-Made/Buildings/College" label "Edit College"
+#. <key key="amenity" value="college" />
+#. item "Man-Made/Buildings/Cinema" label "Edit Cinema"
+#. <key key="amenity" value="cinema" />
+#. item "Man-Made/Buildings/Library" label "Edit Library"
+#. <key key="amenity" value="library" />
+#. item "Man-Made/Buildings/Arts Centre" label "Edit Arts Centre"
+#. <key key="amenity" value="arts_centre" />
+#. item "Man-Made/Buildings/Theatre" label "Edit Theatre"
+#. <key key="amenity" value="theatre" />
+#. item "Man-Made/Buildings/Place of Worship" label "Edit Place of Worship"
+#. <key key="amenity" value="place_of_worship" />
+#. item "Man Made/Works" label "Edit Works"
+#. <key key="man_made" value="works" />
+#. item "Man Made/Tower" label "Edit Tower"
+#. <key key="man_made" value="tower" />
+#. item "Man Made/Water Tower" label "Edit Water Tower"
+#. <key key="man_made" value="water_tower" />
+#. item "Man Made/Gasometer" label "Edit Gasometer"
+#. <key key="man_made" value="gasometer" />
+#. item "Man Made/Lighthouse" label "Edit Lighthouse"
+#. <key key="man_made" value="lighthouse" />
+#. item "Man Made/Windmill" label "Edit Windmill"
+#. <key key="man_made" value="windmill" />
+#. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant"
+#. <key key="man_made" value="wastewater_plant" />
+#. item "Man Made/Crane" label "Edit Crane"
+#. <key key="man_made" value="crane" />
+#. item "Man Made/Beacon" label "Edit Beacon"
+#. <key key="man_made" value="beacon" />
+#. item "Man Made/Survey Point" label "Edit Survey Point"
+#. <key key="man_made" value="survey_point" />
+#. item "Man Made/Surveillance" label "Edit Surveillance Camera"
+#. <key key="man_made" value="surveillance" />
+#. item "Man Made/Power Station" label "Edit Power Station"
+#. <key key="power" value="station" />
+#. item "Amenities/Fountain" label "Edit Fountain"
+#. <key key="amenity" value="fountain" />
+#. item "Amenities/Drinking Water" label "Edit Drinking Water"
+#. <key key="amenity" value="drinking_water" />
+#. item "Shops/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
+#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
+#. item "Shops/Supermarket" label "Edit Supermarket"
+#. <key key="shop" value="supermarket" />
+#. item "Shops/Chemist" label "Edit Chemist"
+#. <key key="shop" value="chemist" />
+#. item "Shops/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Shops/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
+#. item "Shops/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Shops/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
+#. item "Shops/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
+#. item "Shops/Computer" label "Edit Computer Shop"
+#. <key key="shop" value="computer" />
+#. item "Shops/Electronics" label "Edit Electronics Shop"
+#. <key key="shop" value="electronics" />
+#. item "Shops/Hifi" label "Edit Hifi Shop"
+#. <key key="shop" value="hifi" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
+#. item "Shops/Garden Centre" label "Edit Garden Centre"
+#. <key key="shop" value="garden_centre" />
+#. item "Shops/Hardware" label "Edit Hardware Store"
+#. <key key="shop" value="hardware" />
+#. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
+#. <key key="shop" value="doityourself" />
+#. item "Shops/Stationery" label "Edit Stationery Shop"
+#. <key key="shop" value="stationery" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Toys" label "Edit Toy Shop"
+#. <key key="shop" value="toys" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Cash/Bank" label "Edit Bank"
+#. <key key="amenity" value="bank" />
+#. item "Cash/Money Exchange" label "Edit Money Exchange"
+#. <key key="amenity" value="bureau_de_change" />
+#. item "Health/Doctors" label "Edit Doctors"
+#. <key key="amenity" value="doctors" />
+#. item "Health/Dentist" label "Edit Dentist"
+#. <key key="amenity" value="dentist" />
+#. item "Health/Hospital" label "Edit Hospital"
+#. <key key="amenity" value="hospital" />
+#. item "Health/Veterinary" label "Edit Veterinary"
+#. <key key="amenity" value="veterinary" />
+#. item "Geography/Places/Continent" label "Edit Continent"
+#. <space />
+#. <key key="place" value="continent" />
+#. item "Geography/Places/Country" label "Edit Country"
+#. <space />
+#. <key key="place" value="country" />
+#. item "Geography/Places/State" label "Edit State"
+#. <space />
+#. <key key="place" value="state" />
+#. item "Geography/Places/Region" label "Edit Region"
+#. <space />
+#. <key key="place" value="region" />
+#. item "Geography/Places/County" label "Edit County"
+#. <space />
+#. <key key="place" value="county" />
+#. item "Geography/Places/City" label "Edit City"
+#. <space />
+#. <key key="place" value="city" />
+#. item "Geography/Places/Town" label "Edit Town"
+#. <space />
+#. <key key="place" value="town" />
+#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. <space />
+#. <key key="place" value="suburb" />
+#. item "Geography/Places/Village" label "Edit Village"
+#. <space />
+#. <key key="place" value="village" />
+#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. <space />
+#. <key key="place" value="hamlet" />
+#. item "Geography/Places/Locality" label "Edit Locality"
+#. <space />
+#. <key key="place" value="locality" />
+#. item "Geography/Places/Island" label "Edit Island"
+#. <space />
+#. <key key="place" value="island" />
+#. item "Geography/Places/Islet" label "Edit Islet"
+#. <space />
+#. <key key="place" value="islet" />
+#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Places/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Places/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Places/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Land use/Tree" label "Edit Tree"
+#. <key key="natural" value="tree" />
+#. item "Land use/Wood" label "Edit Wood"
+#. <key key="natural" value="wood" />
+#. item "Land use/Forest" label "Edit Forest Landuse"
+#. <space />
+#. <key key="landuse" value="forest" />
+#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
+#. item "Land use/Farmyard" label "Edit Farmyard Landuse"
+#. <space />
+#. <key key="landuse" value="farmyard" />
+#. item "Land use/Farmland" label "Edit Farmland Landuse"
+#. <space />
+#. <key key="landuse" value="farmland" />
+#. item "Land use/Meadow" label "Edit Meadow Landuse"
+#. <space />
+#. <key key="landuse" value="meadow" />
+#. item "Land use/Vineyard" label "Edit Vineyard Landuse"
+#. <space />
+#. <key key="landuse" value="vineyard" />
+#. item "Land use/Allotments" label "Edit Allotments Landuse"
+#. <space />
+#. <key key="landuse" value="allotments" />
+#. item "Land use/Garden" label "Edit Garden"
+#. <key key="leisure" value="garden" />
+#. item "Land use/Grass" label "Edit Grass Landuse"
+#. <space />
+#. <key key="landuse" value="grass" />
+#. item "Land use/Village Green" label "Edit Village Green Landuse"
+#. <space />
+#. <key key="landuse" value="village_green" />
+#. item "Land use/Common" label "Edit Common"
+#. <key key="leisure" value="common" />
+#. item "Land use/Park" label "Edit Park"
+#. <key key="leisure" value="park" />
+#. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
+#. <space />
+#. <key key="landuse" value="recreation_ground" />
+#. item "Land use/Residential area" label "Edit Residential Landuse"
+#. <space />
+#. <key key="landuse" value="residential" />
+#. item "Land use/Graveyard" label "Edit Graveyard"
+#. <key key="amenity" value="grave_yard" />
+#. item "Land use/Cemetery" label "Edit Cemetery Landuse"
+#. <space />
+#. <key key="landuse" value="cemetery" />
+#. item "Land use/Retail" label "Edit Retail Landuse"
+#. <space />
+#. <key key="landuse" value="retail" />
+#. item "Land use/Commercial" label "Edit Commercial Landuse"
+#. <space />
+#. <key key="landuse" value="commercial" />
+#. item "Land use/Industrial" label "Edit Industrial Landuse"
+#. <space />
+#. <key key="landuse" value="industrial" />
+#. item "Land use/Railway land" label "Edit Railway Landuse"
+#. <space />
+#. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
+#. item "Land use/Brownfield" label "Edit Brownfield Landuse"
+#. <space />
+#. <key key="landuse" value="brownfield" />
+#. item "Land use/Greenfield" label "Edit Greenfield Landuse"
+#. <space />
+#. <key key="landuse" value="greenfield" />
+#. item "Land use/Landfill" label "Edit Landfill Landuse"
+#. <space />
+#. <key key="landuse" value="landfill" />
+#. item "Land use/Quarry" label "Edit Quarry Landuse"
+#. <space />
+#. <key key="landuse" value="quarry" />
+#. item "Relations/Multipolygon" label "Edit Multipolygon"
+#. <key key="type" value="multipolygon" />
+#. <optional>
+#. item "Relations/Boundary" label "Edit Boundary"
+#. <key key="type" value="boundary" />
+#. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: build/specialmessages.java:57 build/trans_presets.java:87
+#: build/trans_presets.java:123 build/trans_presets.java:163
+#: build/trans_presets.java:200 build/trans_presets.java:220
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:312 build/trans_presets.java:345
+#: build/trans_presets.java:364 build/trans_presets.java:413
+#: build/trans_presets.java:433 build/trans_presets.java:448
+#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:558 build/trans_presets.java:580
+#: build/trans_presets.java:599 build/trans_presets.java:618
+#: build/trans_presets.java:636 build/trans_presets.java:645
+#: build/trans_presets.java:703 build/trans_presets.java:729
+#: build/trans_presets.java:738 build/trans_presets.java:798
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:981 build/trans_presets.java:991
+#: build/trans_presets.java:999 build/trans_presets.java:1004
+#: build/trans_presets.java:1011 build/trans_presets.java:1018
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1040 build/trans_presets.java:1046
+#: build/trans_presets.java:1052 build/trans_presets.java:1057
+#: build/trans_presets.java:1063 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1087
+#: build/trans_presets.java:1094 build/trans_presets.java:1102
+#: build/trans_presets.java:1115 build/trans_presets.java:1121
+#: build/trans_presets.java:1130 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1150
+#: build/trans_presets.java:1247 build/trans_presets.java:1298
+#: build/trans_presets.java:1304 build/trans_presets.java:1310
+#: build/trans_presets.java:1316 build/trans_presets.java:1322
+#: build/trans_presets.java:1328 build/trans_presets.java:1341
+#: build/trans_presets.java:1366 build/trans_presets.java:1381
+#: build/trans_presets.java:1387 build/trans_presets.java:1395
+#: build/trans_presets.java:1402 build/trans_presets.java:1411
+#: build/trans_presets.java:1419 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1450
+#: build/trans_presets.java:1470 build/trans_presets.java:1482
+#: build/trans_presets.java:1493 build/trans_presets.java:1513
+#: build/trans_presets.java:1522 build/trans_presets.java:1578
+#: build/trans_presets.java:1595 build/trans_presets.java:1602
+#: build/trans_presets.java:1607 build/trans_presets.java:1613
+#: build/trans_presets.java:1619 build/trans_presets.java:1624
+#: build/trans_presets.java:1630 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
+msgid "Name"
+msgstr "名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:115
+msgid "ID:"
+msgstr "ID："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:128
+msgid "Comment:"
+msgstr "注解："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143
+msgid "Open/Closed:"
+msgstr "开放/已关闭："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155
+msgid "Created by:"
+msgstr "建立者："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:168
+msgid "Created on:"
+msgstr "建立于："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180
+msgid "Closed on:"
+msgstr "关闭于："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
+msgid "Remove the changeset in the detail view panel from the local cache"
+msgstr "从本地缓存删除详细数据检视面板中的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
+msgid "Update the changeset from the OSM server"
+msgstr "从 OSM 服务器更新更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358
+msgid ""
+"Select the primitives in the content of this changeset in the current data "
+"layer"
+msgstr "选择在目前数据图层中这个更改组合的内容里的原型"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:424
+#, java-format
+msgid ""
+"<html>None of the objects in the content of changeset {0} is available in "
+"the current<br>edit layer ''{1}''.</html>"
+msgstr ""
+"<html>在目前编辑图层 \"{1}\" 更改组合 {0} 的内容<br>中没有对象可用。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417
+msgid ""
+"Zoom to the primitives in the content of this changeset in the current data "
+"layer"
+msgstr "缩放到目前数据图层这个更改组合的内容的原型"
+
+#. parent for dialog is Main.parent
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:127
+msgid "Download changesets"
+msgstr "下载更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
+#, java-format
+msgid "{0} [incomplete]"
+msgstr "{0} [未完成]"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
+msgid "open"
+msgstr "开启"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
+msgid "closed"
+msgstr "关闭"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:45
+msgid "Changeset ID: "
+msgstr "更改组合 ID： "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
+msgid "Enter a changeset id"
+msgstr "请输入更改组合 id"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
+msgid ""
+"Download the changeset with the specified id, including the changeset content"
+msgstr "以指定的id 下载更改组合，包含更改组合的内容"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
+msgid ""
+"The current value is not a valid changeset ID. Please enter an integer value "
+"> 0"
+msgstr "目前的数值不是有效的更改组合ID。请输入大于0 的整数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
+#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:48
+msgid "Please enter an integer value > 0"
+msgstr "请输入大于 0 的整数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
+msgid "Select changesets owned by specific users"
+msgstr "选择由指定使用者拥有的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
+msgid "Select changesets depending on whether they are open or closed"
+msgstr "根据更改组合是开放或关闭来选择"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
+msgid ""
+"Select changesets based on the date/time they have been created or closed"
+msgstr "根据更改组合建立或关闭的日期/时间来选择"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
+msgid "Select only changesets related to a specific bounding box"
+msgstr "只选择与指定的绑定方块相关的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
+msgid "Query open changesets only"
+msgstr "只查询开放的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
+msgid "Query closed changesets only"
+msgstr "只查询已关闭的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
+msgid "Query both open and closed changesets"
+msgstr "查询开放与关闭的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
+msgid "User ID:"
+msgstr "使用者 ID："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
+msgid "User name:"
+msgstr "使用者名称："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+msgid "Only changesets owned by myself"
+msgstr "只有我自己拥有的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "只有由下列使用者ID 拥有的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
+msgid "Only changesets owned by the user with the following user name"
+msgstr "只有由下列使用者名称拥有的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr "不能限制更改组合的查询为目前的使用者，因为目前的使用者是匿名的"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
+#, java-format
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "使用者ID 目前的数值 \"{0}\" 是无效的"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
+#, java-format
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr "不能限制更改组合的查询为使用者名称 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
+msgid "Please enter a valid user ID"
+msgstr "请输入有效的使用者 ID"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
+msgid "Invalid user ID"
+msgstr "无效的使用者 ID"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
+msgid "Please enter a non-empty user name"
+msgstr "请输入非空白的使用者名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
+msgid "Invalid user name"
+msgstr "无效的使用者名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+msgid "Date: "
+msgstr "日期： "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
+msgid "Closed after - "
+msgstr "在此后关闭 - "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
+msgid "Date:"
+msgstr "日期："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
+msgid "Created before - "
+msgstr "建立早于 - "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
+msgid "Only changesets closed after the following date/time"
+msgstr "只有在下列日期/时间后关闭的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr "只有在指定的日期/时间后关闭或在这之前建立的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr "不能建立以时间限制为基础的更改组合查询。输入是无效的。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>请输入有效的日期/时间数值来将查询限制<br>在指定的时间范围。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
+msgid "Invalid date/time values"
+msgstr "无效的日期/时间数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
+msgstr "不能将更改组合查询限制在指定的绑定方块。输入是无效的。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
+msgstr ""
+"<html>请输入有效的经度/纬度数值来将更改组合查询<br>限制在指定的绑定方块。</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
+msgid "Invalid bounding box"
+msgstr "无效的绑定方块"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr "目前的数值不是有效的使用者 ID。请输入大于 0 的整数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
+msgid ""
+"<html>The  current value is not a valid user name.<br>Please enter an non-"
+"empty user name.</html>"
+msgstr ""
+"<html>目前的数值不是有效的使用者名称。<br>请输入非空的使用者名称。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
+msgid "Please enter an non-empty user name"
+msgstr "请输入非空白的使用者名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
+#, java-format
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: {0}"
+"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"请以您所在地区常用的格式输入日期。<br>范例：{0}<br>范例：{1}<br>范例：{2}<br>"
+"范例：{3}<br>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
+#, java-format
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"请以您所在地区常用的格式输入有效的时间。<br>范例：{0}<br>范例：{1}<br>范例："
+"{2}<br>范例：{3}<br>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
+msgid "Download my changesets only"
+msgstr "只下载我的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
+msgstr ""
+"<html>选择只查询您的更改组合。<br>不选择这项就会查询所有的更改组合。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:126
+msgid ""
+"<html>Please select one the following <strong>standard queries</strong>."
+"Select <strong>Download my changesets only</strong> if you only want to "
+"download changesets created by yourself.<br>Note that JOSM will download "
+"max. 100 changesets.</html>"
+msgstr ""
+"<html>请在下列<strong>标准查询</strong>中选择一项。如果您只想下载由自己建立的"
+"更改组合，请选择<strong>只下载我的更改组合</strong>。<br>注意JOSM 最多只能下"
+"载100 个更改组合。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:147
+msgid "<html>Download the latest changesets</html>"
+msgstr "<html>下载最新的更改组合</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:154
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
+msgstr ""
+"<html>下载我的开放更改组合<br><em>已停用。请先在偏好设定中输入您的OSM 使用者"
+"名称。</em></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
+msgid "<html>Download my open changesets</html>"
+msgstr "<html>下载我的开放更改组合</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:165
+msgid ""
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
+msgstr ""
+"<html>下载在目前地图检视中的更改组合。<br><em>已停用。目前并没有使用中的地图"
+"检视。</em></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168
+msgid "<html>Download changesets in the current map view</html>"
+msgstr "<html>下载在目前地图检视中的更改组合</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
+#, java-format
+msgid ""
+"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
+"default query."
+msgstr ""
+"警告：偏好设定 \"{0}\" 有未预期的数值，得到 \"{1}\"。重设为预设的查询。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:172
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:133
+msgid "Basic"
+msgstr "基本"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
+msgid "Download changesets using predefined queries"
+msgstr "使用预先定义查询来下载更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
+msgid "From URL"
+msgstr "从 URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
+msgid "Query changesets from a server URL"
+msgstr "从服务器 URL 查询更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
+msgid "Advanced"
+msgstr "进阶"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
+msgid "Use a custom changeset query"
+msgstr "使用自定义的更改组合查询"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82
+msgid "Query changesets"
+msgstr "查询更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165
+msgid "Query and download changesets"
+msgstr "查询并下载更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
+msgid "Please enter a valid changeset query URL first."
+msgstr "请先输入有效的更改组合查询URL。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
+msgid "Illegal changeset query URL"
+msgstr "不合法的更改组合查询 URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
+msgid "Close the dialog and abort querying of changesets"
+msgstr "关闭此对话框并放弃更改组合的查询"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:71
+msgid "Querying and downloading changesets"
+msgstr "查询并下载更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
+msgid "Determine user id for current user..."
+msgstr "判断目前使用者的 id..."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
+msgid "Query and download changesets ..."
+msgstr "查询并下载更改组合..."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
+msgid "URL: "
+msgstr "URL: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr "请输入或粘贴从OSM API 取回更改组合的URL。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr "范例"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+"请注意更改组合查询目前永远送出到 \"{0}\" ，不管下列输入的 URL 路径、主机和端"
+"口。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
+msgid "This changeset query URL is invalid"
+msgstr "这个更改组合查询URL 是无效的"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:164
+msgid "Add Properties"
+msgstr "加入属性"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196
+#, java-format
+msgid "This will change {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "这会改变 {0} 个对象。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:198
+msgid "An empty value deletes the tag."
+msgstr "空白的数值代表删除该标签。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:247
+#: ../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:552
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
+msgid "<different>"
+msgstr "<不同>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+msgid "Change values?"
+msgstr "是否改变数值?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "改变属性至 {0} 个对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "这会改变 {0} 个对象。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+msgid "Please select a key"
+msgstr "请选择一个设定键"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+msgid "Please select a value"
+msgstr "请选择一个数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:482
+msgid "Please select the objects you want to change properties for."
+msgstr "请选择您要改变属性的对象。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+msgid "Properties/Memberships"
+msgstr "属性/成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+msgid "Properties for selected objects."
+msgstr "选取对象的属性。"
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:567
+msgid "Member Of"
+msgstr "成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:567
+msgid "Position"
+msgstr "位置"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:940
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "属性：{0} / 成员：{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+msgid "Properties / Memberships"
+msgstr "属性 / 成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:996
+msgid "Change relation"
+msgstr "改变关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
+msgid "Delete from relation"
+msgstr "自关系中删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:999
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "确定要删除关系{0} 的选择区域?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1020
+msgid "Delete the selected key in all objects"
+msgstr "删除所有对象中选取的设定键"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
+msgid "Delete Properties"
+msgstr "删除属性"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1053
+msgid "Add a new key/value pair to all objects"
+msgstr "将新的设定键/数值配对加入到所有的对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+msgid "Edit the value of the selected key for all objects"
+msgstr "编辑所有对象选取设定键的数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1101
+msgid "Select relation"
+msgstr "选择关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1102
+msgid "Select relation in main selection."
+msgstr "选择主要选择区域的关系。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
+msgid "Edit the relation the currently selected relation member refers to."
+msgstr "编辑目前选取的关系成员所参照的关系。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
+msgid "Download all child relations (recursively)"
+msgstr "下载所有子关系(递回式)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
+msgid "Download All Children"
+msgstr "下载所有子项目"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
+msgid "Download selected relations"
+msgstr "下载选取的关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
+msgid "Download Selected Children"
+msgstr "下载选取的子项目"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:64
+msgid "Download relation members"
+msgstr "下载关系成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614
+msgid "Conflict in data"
+msgid_plural "Conflicts in data"
+msgstr[0] "数据中有冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:344
+#, java-format
+msgid ""
+"<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
+"loaded"
+msgstr "<html>子关系<br>{0}<br>已在服务器中删除。它已无法载入"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353
+msgid "Relation is deleted"
+msgstr "关系已删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:503
+#, java-format
+msgid "Downloading relation {0}"
+msgstr "正在下载关系 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#, java-format
+msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr "警告：忽略例外，因为工作已取消。例外：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:93
+#, java-format
+msgid "Downloading {0} incomplete child of relation ''{1}''"
+msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
+msgstr[0] "正下载关系 \"{1}\" 的 {0} 不完整子项目"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:100
+#, java-format
+msgid "Downloading {0} incomplete child of {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgstr[0] "正在下载 {1} 父关系的 {0} 个不完整子项"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+msgid "Download relations"
+msgstr "下载关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
+#, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1})：正在下载关系 \"{2}\" ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153
+msgid "Tags and Members"
+msgstr "标签与成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+msgid "Parent Relations"
+msgstr "上层关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
+msgid "Child Relations"
+msgstr "子关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
+msgid "Apply Role:"
+msgstr "应用角色："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
+msgid "Enter a role and apply it to the selected relation members"
+msgstr "输入一个角色并将它应用至选取的关系成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
+msgid ""
+"<html>There is at least one member in this relation referring<br>to the "
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+"<html>在这个关系中至少有一个成员参照到<br>这个关系自身。<br>这样会建立循环相"
+"依关系，但是不建议这么做。<br>您要如何处理循环相依关系?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
+msgid "Remove them, clean up relation"
+msgstr "删除它们，清除关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+msgid "Ignore them, leave relation as is"
+msgstr "忽略它们，保持关系原貌"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622
+#, java-format
+msgid ""
+"<html>This relation already has one or more members referring to<br>the "
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
+msgstr ""
+"<html>这个关系已经有一或多个成员参照到<br>原型 \"{0}\"<br><br>您确定要加入另"
+"一个关系成员吗?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632
+msgid "Multiple members referring to same primitive"
+msgstr "多个成员参照到同一原型"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#, java-format
+msgid ""
+"<html>You are trying to add a relation to itself.<br><br>This creates "
+"circular references and is therefore discouraged.<br>Skipping relation "
+"''{0}''.</html>"
+msgstr ""
+"<html>您正尝试将关系加入它自己。<br><br>这样会建立循环参照，因此不建议这么"
+"做。<br>正跳过关系 \"{0}\"。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691
+msgid ""
+"Add all primitives selected in the current dataset before the first member"
+msgstr "将目前数据组合中选取的所有原型加到第一个成员之前"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
+msgid ""
+"Add all primitives selected in the current dataset after the last member"
+msgstr "将目前数据组合中选取的所有原型加到最后一个成员之后"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744
+msgid ""
+"Add all primitives selected in the current dataset before the first selected "
+"member"
+msgstr "将目前数据组合中选取的所有原型加到第一个选取的成员之前"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+msgid ""
+"Add all primitives selected in the current dataset after the last selected "
+"member"
+msgstr "将目前数据组合中选取的所有原型加到最后一个选取的成员之后"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
+msgid "Remove all members referring to one of the selected primitives"
+msgstr "删除所有参照到选取原型其中之一的成员"
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813
+msgid "Relation Editor: Remove Selected"
+msgstr "关系编辑器：删除已选取的"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr "选取参照到目前选取范围的关系成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr "选取参照到目前选取范围{0} 原型的关系成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
+msgid "Select primitives for selected relation members"
+msgstr "选择已选取关系成员的原型"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+msgid "Sort the relation members"
+msgstr "排序关系成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
+msgid "Sort"
+msgstr "排序"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Relation Editor: Sort"
+msgstr "关系编辑器：排序"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924
+msgid "Reverse the order of the relation members"
+msgstr "反转关系成员的顺序"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+msgid "Reverse"
+msgstr "反转"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
+msgid "Relation Editor: Reverse"
+msgstr "关系编辑器：反转"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
+msgid "Move the currently selected members up"
+msgstr "将目前选取的成员上移"
+
+#. putValue(NAME, tr("Move Up"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+msgid "Relation Editor: Move Up"
+msgstr "关系编辑器：上移"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
+msgid "Move the currently selected members down"
+msgstr "将目前选取的成员下移"
+
+#. putValue(NAME, tr("Move Down"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+msgid "Relation Editor: Move Down"
+msgstr "关系编辑器：下移"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
+msgid "Remove the currently selected members from this relation"
+msgstr "将目前选取的成员从这个关系中删除"
+
+#. putValue(NAME, tr("Remove"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988
+msgid "Relation Editor: Remove"
+msgstr "关系编辑器：删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004
+msgid "Delete the currently edited relation"
+msgstr "删除目前编辑的关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+msgid ""
+"One or more members of this new relation have been deleted while the "
+"relation editor\n"
+"was open. They have been removed from the relation members list."
+msgstr ""
+"这个新关系的一或多个成员已经在开启关系编辑器的期间被删除了。\n"
+"它们已经从关系成员清单删除了。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595
+msgid "Yes, create a conflict and close"
+msgstr "是，建立冲突并关闭"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106
+msgid "Click to create a conflict and close this relation editor"
+msgstr "点击以建立冲突项目并关闭这个关系编辑器"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601
+msgid "No, continue editing"
+msgstr "否，继续编辑"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112
+msgid "Click to return to the relation editor and to resume relation editing"
+msgstr "点击以返回关系编辑器并继续关系的编辑"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
+msgid ""
+"<html>This relation has been changed outside of the editor.<br>You cannot "
+"apply your changes and continue editing.<br><br>Do you want to create a "
+"conflict and close the editor?</html>"
+msgstr ""
+"<html>这个关系已经在此编辑器以外的地方被改变了。<br>您不能应用自己的变更后继"
+"续编辑。<br><br>是否要建立冲突并关闭编辑器? </html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+"<html>图层 \"{0}\" 已经有冲突于原型<br>\"{1}\"。<br>请先调解这个冲突，然后再"
+"试一次。</html>\""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641
+msgid "Apply the current updates"
+msgstr "应用目前的更新"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684
+msgid "Apply the updates and close the dialog"
+msgstr "应用更新并关闭此对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738
+msgid "Cancel the updates and close the dialog"
+msgstr "取消更新并关闭此对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+msgid "Add an empty tag"
+msgstr "加入空的标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248
+msgid "Download all incomplete members"
+msgstr "下载所有未完成的成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
+msgid "Download Members"
+msgstr "下载成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284
+msgid "Relation Editor: Download Members"
+msgstr "关系编辑器：下载成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281
+msgid "Download selected incomplete members"
+msgstr "下载选取的未完成成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
+msgid "Sets a role for the selected members"
+msgstr "为选取的成员设定角色"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
+msgid "Apply Role"
+msgstr "应用角色"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334
+#, java-format
+msgid "You are setting an empty role on {0} primitive."
+msgid_plural "You are setting an empty role on {0} primitives."
+msgstr[0] "您正在设定{0} 个原型的空白角色。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337
+msgid "This is equal to deleting the roles of these primitives."
+msgstr "这样等同删除这些原型的角色。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339
+msgid "Do you really want to apply the new role?"
+msgstr "您确定要应用新的角色吗?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341
+msgid "Yes, apply it"
+msgstr "是，应用它"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342
+msgid "No, do not apply"
+msgstr "否，不应用"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348
+msgid "Confirm empty role"
+msgstr "确认空白角色"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr "编辑目前选取关系成员所参照的关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1491
+msgid ""
+"Members from paste buffer cannot be added because they are not included in "
+"current layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:809
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:388
+msgid "Zoom to"
+msgstr "缩放至"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+msgid "Zoom to the object the first selected member refers to"
+msgstr "缩放至第一个选取成员所参照的对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211
+msgid "Zooming disabled because layer of this relation is not active"
+msgstr "缩放已停用，因为这个关系的图层未使用"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:216
+msgid "Zooming disabled because there is no selected member"
+msgstr "缩放已停用，因为尚未选取成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:27
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java:29
+msgid "Refers to"
+msgstr "参照到"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+msgid "Download referring relations"
+msgstr "下载参照的关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:186
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "输入时有 {0} 个冲突。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr "警告：因为工作已取消，忽略例外。例外为：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+msgid "including immediate children of parent relations"
+msgstr "包含父关系的直接子项"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+msgid "Load parent relations"
+msgstr "载入上层关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+msgid "Loading parent relations"
+msgstr "正在载入上层关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+msgid "Edit the currently selected relation"
+msgstr "编辑目前选取的关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
+msgid "Apply Changes"
+msgstr "应用变更"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:134
+#, java-format
+msgid "Create new relation in layer ''{0}''"
+msgstr "在图层 \"{0}\" 中建立一个新的关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:136
+#, java-format
+msgid "Edit new relation in layer ''{0}''"
+msgstr "编辑图层 \"{0}\" 中的新关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:138
+#, java-format
+msgid "Edit relation #{0} in layer ''{1}''"
+msgstr "编辑图层 \"{1}\" 的关系 #{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:116
+msgid "Load relation"
+msgstr "载入关系"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:162
+#, java-format
+msgid ""
+"Warning: ignoring exception because task was cancelled. Exception was: {0}"
+msgstr "警告：忽略例外，因为工作已取消。例外：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:70
+msgid "way is connected"
+msgstr "路径已连接"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
+msgid "way is connected to previous relation member"
+msgstr "路径已连接到前一个关系成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:74
+msgid "way is connected to next relation member"
+msgstr "路径已连接到下一个关系成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:76
+msgid "way is not connected to previous or next relation member"
+msgstr "路径未连接到前一个或下一个关系成员"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
+msgid "Bookmarks"
+msgstr "书签"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "<html>这里尚未选取下载区域。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+"<html><strong>目前的下载区域</strong> (最小经度, 最小纬度, 最大经度, 最大纬"
+"度): </html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
+msgid "Create bookmark"
+msgstr "建立书签"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
+msgid "Add a bookmark for the currently selected download area"
+msgstr "将目前选取的下载区域加入书签"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr "目前并未选取任何下载区域。请先选择一个区域。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:253
+msgid "Please enter a name for the bookmarked download area."
+msgstr "请为此下载区域书签输入一个名称。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254
+msgid "Name of location"
+msgstr "位置的名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
+msgid "Remove the currently selected bookmarks"
+msgstr "删除目前选取的书签"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
+msgid "Rename the currently selected bookmark"
+msgstr "重新命名目前选取的书签"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+msgid "min lat"
+msgstr "最小纬度"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+msgid "min lon"
+msgstr "最小经度"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+msgid "max lat"
+msgstr "最大纬度"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+msgid "max lon"
+msgstr "最大经度"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+msgid ""
+"URL from www.openstreetmap.org (you can paste an URL here to download the "
+"area)"
+msgstr "www.openstreetmap.org 的 URL (您可以在这里粘贴 URL 下载该区域)"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+msgid "Bounding Box"
+msgstr "绑定方块"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
+#, java-format
+msgid "The string ''{0}'' is not a valid double value."
+msgstr "字串 \"{0}\" 不是一个合格的 double 数值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
+msgid "Value for latitude in range [-90,90] required."
+msgstr "纬度的数值范围必须为[-90,90]。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
+msgid "Value for longitude in range [-180,180] required."
+msgstr "经度的数值范围必须为[-180,180]。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
+msgid "Paste URL from clipboard"
+msgstr "从剪贴簿粘贴 URL"
+
+#. adding the download tasks
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:97
+msgid "Data Sources and Types:"
+msgstr "数据来源和类型："
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap 数据"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:99
+msgid "Select to download OSM data in the selected download area."
+msgstr "选择以下载选取下载区域中的OSM 数据。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:101
+msgid "Raw GPS data"
+msgstr "原始 GPS 数据"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:102
+msgid "Select to download GPS traces in the selected download area."
+msgstr "选择以下载选取下载区域中的GPS 轨迹。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:133
+msgid "Download as new layer"
+msgstr "下载为新图层"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:134
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+"<html>选择以将数据下载到新的数据图层。<br>不选择则会下载到目前使用中的数据图"
+"层。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+msgid "No area selected yet"
+msgstr "尚未选取区域"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
+msgid "Download area too large; will probably be rejected by server"
+msgstr "下载区域太大；可能会被服务器拒绝"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
+msgid "Download area ok, size probably acceptable to server"
+msgstr "下载区域合适，大小应该会被服务器接受"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:378
+msgid "Click to close the dialog and to abort downloading"
+msgstr "点击以关闭此对话框并放弃下载"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395
+msgid "Click do download the currently selected area"
+msgstr "点击以下载目前选取的区域"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402
+msgid "Please select a download area first."
+msgstr "请先选择下载区域。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:411
+#, java-format
+msgid ""
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
+"<html>不论<strong>{0}</strong> 或 <strong>{1}</strong> 都没有启用。<br>请选择"
+"下载 OSM 数据，或 GPX 数据，或两个都选。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
+msgid "Class Type"
+msgstr "类别类型"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+msgid "Bounds"
+msgstr "边界"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+msgid "Near"
+msgstr "靠近"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+msgctxt "placeselection"
+msgid "Zoom"
+msgstr "缩放"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:101
+msgid "Choose the server for searching:"
+msgstr "选择查找用的服务器："
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
+msgid "Enter a place name to search for:"
+msgstr "输入要查找位置的名称："
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
+msgid "Enter a place name to search for"
+msgstr "输入要查找的位置名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
+msgid "Areas around places"
+msgstr "在位置附近的区域"
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "空指标例外(Null pointer exception)，可能遗漏某些标签。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
+msgid "Search ..."
+msgstr "查找 ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
+msgid "Click to start searching for places"
+msgstr "点击以开始查找位置"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
+msgid "Querying name server"
+msgstr "查询名称服务器"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
+msgid "Querying name server ..."
+msgstr "查询名称服务器..."
+
+#. Strings in JFileChooser
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Power Generator" label "Edit Power Generator"
+#. <key key="power" value="generator" />
+#. item "Man Made/Power Tower" label "Edit Power Tower"
+#. item "Land use/Tree" text "Name"
+#. item "Land use/Wood" text "Name"
+#. item "Land use/Forest" text "Name"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
+#: build/specialmessages.java:71 build/trans_presets.java:411
+#: build/trans_presets.java:669 build/trans_presets.java:678
+#: build/trans_presets.java:1041 build/trans_presets.java:1368
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
+msgid "Type"
+msgstr "类型"
+
+#. item "Ways/Path" combo "Wheelchairs"
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:58
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:140
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:281
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:408
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:499
+#: build/trans_presets.java:542 build/trans_presets.java:654
+#: build/trans_presets.java:669 build/trans_presets.java:1278
+#: build/trans_presets.java:1373 build/trans_presets.java:1374
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+msgid "unknown"
+msgstr "不明"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:37
+msgid "Slippy map"
+msgstr "快速地图"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:37
+msgid "Tile Numbers"
+msgstr "拼贴数"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr "读取CSS 文件''help-browser.css'' 失败。例外为：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
+msgid "JOSM Help Browser"
+msgstr "JOSM 协助文件浏览器"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
+#, java-format
+msgid ""
+"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
+"class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
+"is not available yet. It is missing both in your local language ({1}) and in "
+"english.<br><br>Please help to improve the JOSM help system and fill in the "
+"missing information. You can both edit the <a href=\"{2}\">help topic in "
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
+"a>.</p></html>"
+msgstr ""
+"<html><p class=\"warning-header\">缺少帮助主题的内容</p><p class=\"warning-"
+"body\">帮助主题的内容 <strong>{0}</strong> 尚不能取得。不管是您当地语言 "
+"({1}) 或是英语版本都没有。<br><br>请协助改进 JOSM 帮助系统并填好缺少的信息。"
+"您可以编辑<a href=\"{2}\">将帮助主题编辑为当地的语言 ({1})</a> 和 <a href="
+"\"{3}\">英语版本</a>。</p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
+#, java-format
+msgid ""
+"<html><p class=\"error-header\">Error when retrieving help information</p><p "
+"class=\"error-body\">The content for the help topic <strong>{0}</strong> "
+"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
+"p></html>"
+msgstr ""
+"<html><p class=\"error-header\">在取得帮助信息时发生错误</p><p class=\"error-"
+"body\">无法载入帮助主题 <strong>{0}</strong> 的内容。错误信息为 (未经翻译)："
+"<br><tt>{1}</tt></p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check<br>your internet connection</html>"
+msgstr ""
+"<html>无法开启 url {0} 的帮助页面。<br>这大部分是网络问题造成的，请检查<br>您"
+"的互联网网络连接</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360
+msgid "Failed to open URL"
+msgstr "无法开启 URL"
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393
+msgid "Open the current help page in an external browser"
+msgstr "在外部浏览器开启目前的帮助页面"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405
+msgid "Edit the current help page"
+msgstr "编辑目前的说明页面"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
+#, java-format
+msgid ""
+"<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
+"possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
+msgstr ""
+"<html>目前的URL <tt>{0}</tt><br>是外部 URL。编辑帮助主题只能在<br>帮助服务器 "
+"<tt>{1}</tt> 进行。</html>"
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437
+msgid "Reload the current help page"
+msgstr "重新载入目前的说明页面"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452
+msgid "Go to the previous page"
+msgstr "回到上一页"
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472
+msgid "Go to the next page"
+msgstr "前往下一页"
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488
+msgid "Go to the JOSM help home page"
+msgstr "转到 JOSM 帮助首页"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519
+#, java-format
+msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgstr "警告：在HTML 文件中有错误的位置。例外为：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569
+msgid "Failed to open help page. The target URL is empty."
+msgstr "无法开启帮助页面。目标URL 是空的。"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570
+msgid "Failed to open help page"
+msgstr "无法开启说明页面"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:180
+msgid "Latitude: "
+msgstr "纬度： "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:198
+msgid "Longitude: "
+msgstr "经度： "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
+msgid "Coordinates"
+msgstr "坐标"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for node {0}"
+msgstr "节点 {0} 的历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#, java-format
+msgid "History for way {0}"
+msgstr "路径 {0} 的历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#, java-format
+msgid "History for relation {0}"
+msgstr "关系 {0} 的历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+msgid "Reload the history from the server"
+msgstr "重新载入服务器的历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr "历史纪录尚未初始化。设定参照原型失败。"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr "设定参照失败。参照ID {0} 与历史纪录ID {1} 不符。"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr "设定参照失败。参照版本{0} 在历史纪录中无法使用。"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr "历史纪录尚未初始化。设定目前的原型失败。"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr "无法设定目前的原型。目前的版本{0} 并不存在历史纪录中。"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
+msgid "Load history"
+msgstr "载入历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:186
+#, java-format
+msgid "Loading history for node {0}"
+msgstr "正在载入节点 {0} 的历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187
+#, java-format
+msgid "Loading history for way {0}"
+msgstr "正在载入路径 {0} 的历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr "正在载入关系 {0} 的历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77
+#, java-format
+msgid "Node {0}"
+msgstr "节点 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195
+msgid "Zoom to node"
+msgstr "缩放到节点"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+msgid "Zoom to this node in the current data layer"
+msgstr "缩放到目前数据图层的这个节点"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
+msgid "Open a history browser with the history of this node"
+msgstr "开启历史纪录浏览器观看这个节点的历史纪录"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78
+#, java-format
+msgid "Way {0}"
+msgstr "路径 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Relation {0}"
+msgstr "关系 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
+msgid "not present"
+msgstr "未显现"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:56
+msgid "Changeset"
+msgstr "更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:92
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr "<html>版本 <strong>{0}</strong> 目前在图层 \"{1}\" 中编辑</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:98
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
+msgstr "<html>版本<strong>{0}</strong> 建立于<strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
+msgid "Changeset info"
+msgstr "更改组合信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
+msgid "Launch browser with information about the changeset"
+msgstr "执行浏览器观看这个更改组合的信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139
+#, java-format
+msgid "Show changeset {0}"
+msgstr "显示更改组合 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:63
+#, java-format
+msgid "Version {0}, {1} (by {2})"
+msgstr "版本 {0}, {1} (by {2})"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:79
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "版本 {0} 由 {2} 建立于 {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:107
+#, java-format
+msgid "Version {0} in editor"
+msgstr "编辑器中的版本 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:109
+msgid "[deleted]"
+msgstr "[已删除]"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:119
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
+msgstr "版本{0} 目前在数据图层 \"{1}\" 中编辑"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
+msgid "Version"
+msgstr "版本"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62
+#, java-format
+msgid ""
+"Failed to update primitive with id {0} because current edit layer is null"
+msgstr "无法更新id {0} 的原型，因为目前编辑的图层为null"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
+#, java-format
+msgid ""
+"Failed to update primitive with id {0} because current edit layer does not "
+"include such a primitive"
+msgstr "无法更新id {0} 的原型，因为目前编辑的图层并没有这个原型"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94
+#, java-format
+msgid "Synchronize node {0} only"
+msgstr "只同步节点 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95
+#, java-format
+msgid "Synchronize way {0} only"
+msgstr "只同步路径 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96
+#, java-format
+msgid "Synchronize relation {0} only"
+msgstr "只同步关系 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154
+msgid "Synchronize entire dataset"
+msgstr "同步整个数据组"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
+"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>上传<strong>失败</strong>，因为服务器上的节点、<br>路径或关系比您的版本"
+"更新。<br>这个冲突是由于 <strong>{0}</strong> ( id <strong>{1}</strong>) 造"
+"成，<br>服务器的版本为 {2}，您的版本为 {3}。<br><br>请点击 <strong>{4}</"
+"strong> 只同步有冲突的原型。<br>点击 <strong>{5}</strong> 会与服务器同步整个"
+"本地数据组合。<br>点击 <strong>{6}</strong> 则会放弃并继续编辑。<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
+msgid "Conflicts detected"
+msgstr "选取的冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>上传<strong>失败</strong>，因为服务器已有您的节点、路径或关系<br>的新版"
+"本。<br><br>请按 <strong>{0}</strong> 将整个本地数据组与服务器同步。<br>按 "
+"<strong>{1}</strong> 则会放弃并继续编辑。<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you have been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+"<html>上传<strong>失败</strong>，因为您使用的<br>更改组合 {0} 已经在 {1} 被关"
+"闭了。<br>请以新的或已开启的更改组合再上传一次。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
+msgid "Changeset closed"
+msgstr "更改组合已关闭"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214
+msgid "Prepare conflict resolution"
+msgstr "准备冲突的调解"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216
+#, java-format
+msgid "Click to download all parent ways for node {0}"
+msgstr "点击以下载节点{0} 的所有上层路径"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222
+msgid "Click to cancel and to resume editing the map"
+msgstr "点击以取消或恢复编辑地图"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you tried to delete node {0} "
+"which is still in use in way {1}.<br><br>Click <strong>{2}</strong> to "
+"download all parent ways of node {0}.<br>If necessary JOSM will create "
+"conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
+msgstr ""
+"<html>上传<strong>已失败</strong>，因为您尝试删除的节点 {0} 仍被路径 {1} 使用"
+"中。<br><br>请点击 <strong>{2}</strong> 以下载节点 {0} 的所有上层路径。<br>如"
+"果有需要JOSM 会建立冲突项目让您可以在冲突解决对话框中处理它。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
+msgid "Node still in use"
+msgstr "节点仍在使用中"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292
+#, java-format
+msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgstr "警告：错误标头 \"{0}\" 与预期的模式不符"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "提供你的修改的一些简短说明："
+
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "不合格的上传注解"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
+msgid "Changeset id:"
+msgstr "更改组合 id："
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+msgid "Created at:"
+msgstr "建立于："
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+msgid "Changeset comment:"
+msgstr "更改组合注解："
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "没有开放更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:80
+msgid ""
+"Please decide what changeset the data is uploaded to and whether to close "
+"the changeset after the next upload."
+msgstr "请决定要上传哪个更改组合的数据以及在下次上传后是否关闭更改组合。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:89
+msgid "Upload to a new changeset"
+msgstr "上传至新的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:90
+msgid "Open a new changeset and use it in the next upload"
+msgstr "开启新的更改组合并在下次上传时使用它"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:99
+msgid "Upload to an existing changeset"
+msgstr "上传至现有的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:100
+msgid "Upload data to an already existing and open changeset"
+msgstr "上传数据到已经存在且开放的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:111
+msgid "Select an open changeset"
+msgstr "选择一个开放更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:145
+msgid "Close changeset after upload"
+msgstr "在上传后关闭更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:146
+msgid "Select to close the changeset after the next upload"
+msgstr "选择此项会在下次上传后关闭更改组合"
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:309
+msgid "Load the list of your open changesets from the server"
+msgstr "从服务器载入您的开放更改组合清单"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:327
+msgid "Close the currently selected open changeset"
+msgstr "关闭目前选取的开放更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "<html>请选择您想要关闭的更改组合</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
+msgid "Open changesets"
+msgstr "开放的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119
+msgid "Close changesets"
+msgstr "关闭的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121
+msgid "Close the selected open changesets"
+msgstr "关闭选取的开放更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144
+msgid "Cancel closing of changesets"
+msgstr "取消更改组合的关闭"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38
+msgid "Closing changeset"
+msgstr "正在关闭更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76
+#, java-format
+msgid "Closing changeset {0}"
+msgstr "正在关闭更改组合 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99
+msgid ""
+"Warning: failed to put Credential Dialog always on top. Caught security "
+"exception."
+msgstr "警告：无法将凭证对话框永远置于最上层。抓到安全性例外。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
+msgid "Enter credentials for OSM API"
+msgstr "输入 OSM API 的凭证"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112
+msgid "Enter credentials for HTTP proxy"
+msgstr "输入 HTTP 代理服务器所需凭证"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145
+msgid "Save user and password (unencrypted)"
+msgstr "保存使用者与密码(未加密)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237
+msgid "Please enter the user name of your OSM account"
+msgstr "请输入您 OSM 帐号的使用者名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
+msgid "Please enter the password of your OSM account"
+msgstr "请输入您 OSM 帐号的密码"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
+#, java-format
+msgid ""
+"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
+"and a valid password."
+msgstr "在 OSM API \"{0}\" 验证失败。请输入有效的用户名和密码。\""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
+msgid "Warning: The password is transferred unencrypted."
+msgstr "警告：密码是以未加密的方式传输。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254
+msgid "Please enter the user name for authenticating at your proxy server"
+msgstr "请输入您的代理服务器验证用的使用者名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255
+msgid "Please enter the password for authenticating at your proxy server"
+msgstr "请输入您的代理服务器验证用的密码"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257
+#, java-format
+msgid ""
+"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
+"username and a valid password."
+msgstr "在 HTTP 代理服务器 \"{0}\" 验证失败。请输入有效的用户名和密码。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
+msgid ""
+"Warning: depending on the authentication method the proxy server uses the "
+"password may be transferred unencrypted."
+msgstr ""
+"<html>警告：根据此代理服务器所使用的验证方式，密码可能是以未加密的方式传输。"
+"</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
+msgid "Authenticate"
+msgstr "验证"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280
+msgid "Authenticate with the supplied username and password"
+msgstr "以指定的使用者名称和密码进行验证"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293
+msgid "Cancel authentication"
+msgstr "取消验证"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63
+msgid ""
+"Could not retrieve the list of your open changesets because<br>JOSM does not "
+"know your identity.<br>You have either chosen to work anonymously or you are "
+"not entitled<br>to know the identity of the user on whose behalf you are "
+"working."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
+msgid "Missing user identity"
+msgstr "遗失使用者识别"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:120
+#, java-format
+msgid ""
+"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
+"was: {0}"
+msgstr "警告：无法取得目前的 JOSM 使用者信息。例外为：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
+msgid "Launch a file chooser to select a file"
+msgstr "开启文件选择器来选择文件"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+msgid "Select filename"
+msgstr "选择文件名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+msgid "No"
+msgstr "否"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
+#, java-format
+msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgstr "图层 \"{0}\" 已被修改，应上传至服务器。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49
+#, java-format
+msgid "Layer ''{0}'' has no modifications to be uploaded."
+msgstr "图层 \"{0}\" 没有可上传的修改。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60
+#, java-format
+msgid ""
+"Layer ''{0}'' has modifications which should be saved to its associated file "
+"''{1}''."
+msgstr "图层 \"{0}\" 已被修改，应保存到它关联的文件 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62
+#, java-format
+msgid "Layer ''{0}'' has no modifications to be saved."
+msgstr "图层 \"{0}\" 没有要保存的修改。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80
+msgid "No file associated with this layer"
+msgstr "没有文件与这个图层关联"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83
+msgid "Please select a file"
+msgstr "请选择一个文件"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86
+#, java-format
+msgid "Layer ''{0}'' is not backed by a file"
+msgstr "图层 \"{0}\" 没有被文件备份"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101
+#, java-format
+msgid "File ''{0}'' is not writable. Please enter another file name."
+msgstr "文件 \"{0}\" 不可写入。请输入另一个文件名称。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115
+#, java-format
+msgid "Select to upload layer ''{0}'' to the server ''{1}''"
+msgstr "选择上载图层 \"{0}\" 至服务器 \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
+#, java-format
+msgid "Saving layer to ''{0}'' ..."
+msgstr "正将图层保存为 \"{0}\" ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+msgid "Unsaved changes - Save/Upload before exiting?"
+msgstr "未保存的变更 - 是否在结束前保存/上传?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+msgid "Unsaved changes - Save/Upload before deleting?"
+msgstr "未保存的变更 - 是否在删除前保存/上传?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+msgid "Uploading and saving modified layers ..."
+msgstr "正在上传与保存修改过的图层 ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#, java-format
+msgid ""
+"<html>{0} layer has unresolved conflicts.<br>Either resolve them first or "
+"discard the modifications.<br>Layer with conflicts:</html>"
+msgid_plural ""
+"<html>{0} layers have unresolved conflicts.<br>Either resolve them first or "
+"discard the modifications.<br>Layers with conflicts:</html>"
+msgstr[0] ""
+"<html>{0} 个图层有未解决的冲突。<br>请先调解它或放弃这个修改。<br>有冲突的图"
+"层：</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+msgid "Unsaved data and conflicts"
+msgstr "未保存的数据和冲突"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#, java-format
+msgid ""
+"<html>{0} layer needs saving but has no associated file.<br>Either select a "
+"file for this layer or discard the changes.<br>Layer without a file:</html>"
+msgid_plural ""
+"<html>{0} layers need saving but have no associated file.<br>Either select a "
+"file for each of them or discard the changes.<br>Layers without a file:</"
+"html>"
+msgstr[0] ""
+"<html>{0} 个图层需要保存却没有关联的文件。<br>请先选择一个文件或放弃这个修"
+"改。<br>没有文件的图层：</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+msgid "Unsaved data and missing associated file"
+msgstr "未保存的数据并缺少关联的文件"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#, java-format
+msgid ""
+"<html>{0} layer needs saving but has an associated file<br>which cannot be "
+"written.<br>Either select another file for this layer or discard the changes."
+"<br>Layer with a non-writable file:</html>"
+msgid_plural ""
+"<html>{0} layers need saving but have associated files<br>which cannot be "
+"written.<br>Either select another file for each of them or discard the "
+"changes.<br>Layers with non-writable files:</html>"
+msgstr[0] ""
+"<html>{0} 个图层需要保存但是关联的文件<br>却不能写入。<br>请选择另一个文件或"
+"放弃这个修改。<br>无法写入文件的图层：</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+msgid "Unsaved data non-writable files"
+msgstr "未保存的数据有无法写入的文件"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+msgid "Close this dialog and resume editing in JOSM"
+msgstr "关闭这个对话框并继续以 JOSM 编辑"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+msgid "Discard and Exit"
+msgstr "放弃修改且离开"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+msgid "Exit JOSM without saving. Unsaved changes are lost."
+msgstr "不保存就结束 JOSM。未保存的变更会消失。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
+msgid "Discard and Delete"
+msgstr "放弃并删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
+msgid "Delete layers without saving. Unsaved changes are lost."
+msgstr "不保存就删除图层。未保存的变更会消失。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+msgid "Save/Upload and Exit"
+msgstr "保存/上传并离开"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr "保存后结束 JOSM。未保存的变更会上传和/或保存。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
+msgid "Save/Upload and Delete"
+msgstr "保存/上传并删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
+msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
+msgstr "删除图层前先保存/上传。未保存的变更不会消失。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#, java-format
+msgid "Preparing layer ''{0}'' for upload ..."
+msgstr "正准备上传图层 \"{0}\" ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
+#, java-format
+msgid ""
+"<html>An upload and/or save operation of one layer with modifications<br>was "
+"cancelled or has failed.</html>"
+msgid_plural ""
+"<html>Upload and/or save operations of {0} layers with modifications<br>were "
+"cancelled or have failed.</html>"
+msgstr[0] ""
+"<html>上传和/或保存的选项，用于 {0} 个修改过的图层<br>被取消或有错误时。</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
+msgid "Incomplete upload and/or save"
+msgstr "不完整上传和/或保存"
+
+#. item "Highways/Streets/Motorway" text "Name"
+#. item "Highways/Streets/Motorway Link" label "Edit Motorway Link"
+#. <space />
+#. <key key="highway" value="motorway_link" />
+#. <optional>
+#. item "Highways/Streets/Trunk" text "Name"
+#. item "Highways/Streets/Trunk Link" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Primary" text "Name"
+#. item "Highways/Streets/Primary Link" label "Edit Primary Link"
+#. <space />
+#. <key key="highway" value="primary_link" />
+#. <optional>
+#. item "Highways/Streets/Secondary" text "Name"
+#. item "Highways/Streets/Tertiary" text "Name"
+#. item "Highways/Streets/Unclassified" check "Passing Places"
+#. item "Highways/Streets/Residential" check "Embankment"
+#. item "Highways/Streets/Living Street" check "Embankment"
+#. item "Highways/Streets/Pedestrian" check "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
+#. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
+#. item "Highways/Streets/Roundabout" check "Embankment"
+#. item "Highways/Streets/Bridge" text "Name"
+#. item "Highways/Streets/Tunnel" text "Name"
+#. item "Ways/Track" check "Oneway"
+#. item "Ways/Dedicated Bridleway" check "Embankment"
+#. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
+#. item "Ways/Steps" check "Embankment"
+#. item "Water/Water/Drain" text "Name"
+#. item "Water/Water/Ditch" text "Name"
+#. item "Water/Water/Stream" text "Name"
+#. item "Water/Water/Canal" text "Name"
+#. item "Water/Water/River" text "Name"
+#. item "Transport/Railway/Bus Guideway" check "Embankment"
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
+#: build/trans_presets.java:88 build/trans_presets.java:105
+#: build/trans_presets.java:124 build/trans_presets.java:143
+#: build/trans_presets.java:164 build/trans_presets.java:180
+#: build/trans_presets.java:201 build/trans_presets.java:221
+#: build/trans_presets.java:245 build/trans_presets.java:263
+#: build/trans_presets.java:281 build/trans_presets.java:299
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:370 build/trans_presets.java:419
+#: build/trans_presets.java:434 build/trans_presets.java:449
+#: build/trans_presets.java:472 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:565 build/trans_presets.java:588
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:958 build/trans_presets.java:966
+#: build/trans_presets.java:974 build/trans_presets.java:982
+#: build/trans_presets.java:992 build/trans_presets.java:1253
+msgid "Layer"
+msgstr "层级"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28
+msgid "Should upload?"
+msgstr "是否上传?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36
+msgid "Should save?"
+msgstr "是否保存?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44
+msgid "Filename"
+msgstr "文件名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
+msgid "Upload"
+msgstr "上传"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:56
+msgid "Update objects"
+msgstr "更新对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:107
+msgid "Initializing nodes to update ..."
+msgstr "正在初始化要更新的节点 ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:123
+msgid "Initializing ways to update ..."
+msgstr "正在初始化要更新的路径 ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:132
+msgid "Initializing relations to update ..."
+msgstr "正在初始化要更新的关系 ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
+#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
+#: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
+msgid "Settings"
+msgstr "设定值"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+msgid "Decide how to upload the data and which changeset to use"
+msgstr "决定如何上传数据以及要使用哪个更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Tags of new changeset"
+msgstr "新更改组合的标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+msgid "Apply tags to the changeset data is uploaded to"
+msgstr "将标签应用到上传的更改组合数据"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+msgid "Manage open changesets and select a changeset to upload to"
+msgstr "管理开放的更改组合并选择要上传的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
+msgid "Configure advanced settings"
+msgstr "设定进阶设定值"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
+#, java-format
+msgid "Upload to ''{0}''"
+msgstr "上传到 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
+msgid "Upload Changes"
+msgstr "上传变更"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
+msgid "Upload the changed primitives"
+msgstr "上传已变更的原型"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
+msgstr "不合格的上传注解"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "反转"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "继续"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "取消并回到编辑器"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "不要再次显示这个信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
+msgid "Please enter a valid chunk size first"
+msgstr "请先输入有效的区块大小"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
+msgid "Illegal chunk size"
+msgstr "不合格的区块大小"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
+msgid "Cancel the upload and resume editing"
+msgstr "取消上传并继续编辑"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr "更改组合 {0} 的标签"
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr "警告：原型 \"{0}\" 已在服务器上删除了。正跳过这个原型并尝试重新上传。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
+msgid "Preparing primitives to upload ..."
+msgstr "正在准备要上传的原型 ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
+msgid "Objects are uploaded to a <strong>new changeset</strong>."
+msgstr "对象会上传到<strong>新的更改组合</strong>。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
+#, java-format
+msgid ""
+"Objects are uploaded to the <strong>open changeset</strong> {0} with upload "
+"comment ''{1}''."
+msgstr "对象会上传到<strong>开放更改组合</strong> {0}，上传注解为 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
+msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgstr "这个更改组合在这次上传后会<strong>关闭</strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:57
+msgid "The changeset is <strong>left open</strong> after this upload"
+msgstr "这个更改组合在这次上传后会<strong>保持开放</strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:59
+msgid "configure changeset"
+msgstr "设定更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:81
+#, java-format
+msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
+msgid_plural ""
+"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
+msgstr[0] ""
+"正在上传 <strong>{0} 个对象</strong>到 <strong>1 个更改组合</strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:87
+#, java-format
+msgid ""
+"Uploading <strong>{0} object</strong> to <strong>1 changeset</strong> using "
+"<strong>1 request</strong>"
+msgid_plural ""
+"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
+"<strong>1 request</strong>"
+msgstr[0] ""
+"正在使用 <strong>1 次要求</strong>上传 <strong>{0} 个对象</strong>到 "
+"<strong>1 个更改组合</strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:92
+#, java-format
+msgid ""
+"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
+"<strong>{1} requests</strong>"
+msgstr ""
+"正在使用 <strong>{1} 次要求</strong>上传 <strong>{0} 个对象</strong>到 "
+"<strong>1 个更改组合</strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:102
+msgid "advanced configuration"
+msgstr "进阶的组态"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:98
+#, java-format
+msgid ""
+"{0} objects exceed the max. allowed {1} objects in a changeset on the server "
+"''{2}''. Please <a href=\"urn:advanced-configuration\">configure</a> how to "
+"proceed with <strong>multiple changesets</strong>"
+msgstr ""
+"{0} 个对象超过服务器 \"{2}\" 更改组合最多允许的 {1} 个对象。请 <a href=\"urn:"
+"advanced-configuration\">设定</a>如何处理<strong>多个更改组合</strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:101
+#, java-format
+msgid ""
+"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
+"strong> using <strong>{1} requests</strong>"
+msgstr ""
+"正在使用 <strong>{1} 次要求</strong>上传 <strong>{0}个对象</strong>到<strong>"
+"多个更改组合</strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:67
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr "上传图层 \"{0}\" 的数据"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:81
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:275
+msgid "Continue uploading"
+msgstr "正在继续上传"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:83
+msgid "Click to continue uploading to additional new changesets"
+msgstr "点击继续以上传到另外的新更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:87
+msgid "Go back to Upload Dialog"
+msgstr "回到上传对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:89
+msgid "Click to return to the Upload Dialog"
+msgstr "点击以回到上传对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:93
+msgid "Abort"
+msgstr "中止"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:95
+msgid "Click to abort uploading"
+msgstr "点击以放弃上传"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:100
+#, java-format
+msgid ""
+"The server reported that the current changeset was closed.<br>This is most "
+"likely because the changesets size exceeded the max. size<br>of {0} objects "
+"on the server ''{1}''."
+msgstr ""
+"服务器回复目前的更改组合已关闭。<br>这很可能是由于更改组合的大小超过<br>服务"
+"器 \"{1}\" 最大 {0} 个对象的大小。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:107
+#, java-format
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
+msgstr[0] "还剩下 {0} 个对象要上传。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:113
+#, java-format
+msgid ""
+"Click ''<strong>{0}</strong>'' to continue uploading to additional new "
+"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
+"<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
+"editing.<br>"
+msgstr ""
+"点击\"<strong>{0}</strong>\"继续上传到另外的新更改组合。<br>点击\"<strong>{1}"
+"</strong>\"回到上传对话框。<br>点击\"<strong>{2}</strong>\"放弃上传并回到地图"
+"编辑。<br>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:124
+msgid "Changeset is full"
+msgstr "更改组合已满"
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+"警告：对象 \"{0}\" 已经在服务器端被删除了。现在跳过这个对象并重新尝试上传。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr "对象 \"{0}\" 已经被删除。在上传中跳过此对象。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "正在上传 {0} 个对象..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr "忽略捕捉到的例外，因为上传已被取消。例外为：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:60
+msgid ""
+"<html>Mark modified objects <strong>from the current selection</strong> to "
+"be uploaded to the server.</html>"
+msgstr ""
+"<html><strong>从目前的选择区域</strong>标记修改过的对象上传到服务器。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70
+msgid ""
+"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
+"server.</html>"
+msgstr "<html>将<strong>在本地删除的对象</strong>标记为在服务器上删除。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112
+msgid "Select objects to upload"
+msgstr "选择要上传的对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:261
+msgid "Cancel uploading"
+msgstr "正在取消上传"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:88
+#, java-format
+msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr "警告：偏好设定的设定键 \"{0}\" 有未预期的数值，得到 \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
+msgid "Please select the upload strategy:"
+msgstr "请选择上传的方式："
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343
+msgid "Upload data in one request"
+msgstr "以一次要求上传数据"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131
+msgid "Upload data in chunks of objects. Chunk size: "
+msgstr "以区块式对象上传数据。区块大小： "
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158
+msgid "Upload each object individually"
+msgstr "分别上传每一个对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. Which strategy do you want to use?</html>"
+msgstr ""
+"<html>需要<strong>多个更改组合</strong>才能上传 {0} 个对象。您想要使用哪种方"
+"式?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
+msgid "Fill up one changeset and return to the Upload Dialog"
+msgstr "填满一个更改组合并回到上传对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193
+msgid "Open and use as many new changesets as necessary"
+msgstr "开启并依需要使用新的更改组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323
+msgid "Upload in one request not possible (too many objects to upload)"
+msgstr "以一次要求上传是不可能的 (太多对象要上传)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324
+#, java-format
+msgid ""
+"<html>Cannot upload {0} objects in one request because the<br>max. changeset "
+"size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+"<html>不能以一次要求上传 {0} 个对象，因为超过了服务器 \"{2}\" <br>的最大更改"
+"组合大小 {1}。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What strategy do you want to use?</html>"
+msgstr ""
+"<html>需要<strong>多个更改组合</strong>才能上传 {0} 个对象。您想要使用哪种方"
+"式?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
+msgid "(1 request)"
+msgstr "(1 次要求)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362
+msgid "(# requests unknown)"
+msgstr "(# 要求不明)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366
+#, java-format
+msgid "({0} request)"
+msgid_plural "({0} requests)"
+msgstr[0] "({0} 次要求)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411
+msgid "Illegal chunk size <= 0. Please enter an integer > 1"
+msgstr "不合格的区块大小 <= 0。请输入大于 1 的整数"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419
+#, java-format
+msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
+msgstr "区块大小 {0} 超过最大值。服务器 \"{2}\" 的更改组合大小为 {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415
+msgid "Please enter an integer > 1"
+msgstr "请输入大于 1 的整数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422
+#, java-format
+msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
+msgstr "数值 \"{0}\" 不是数字。请输入大于 1 的整数"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52
+msgid "Objects to add:"
+msgstr "要加入的对象："
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58
+msgid "Objects to modify:"
+msgstr "要编辑的对象："
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64
+msgid "Objects to delete:"
+msgstr "要删除的对象："
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95
+#, java-format
+msgid "{0} object to add:"
+msgid_plural "{0} objects to add:"
+msgstr[0] "{0} 个对象要加入："
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104
+#, java-format
+msgid "{0} object to modify:"
+msgid_plural "{0} objects to modify:"
+msgstr[0] "{0} 个对象要编辑："
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113
+#, java-format
+msgid "{0} object to delete:"
+msgid_plural "{0} objects to delete:"
+msgstr[0] "{0} 个对象要删除："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
+msgid "gps point"
+msgstr "gps 点"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "名称：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+#, java-format
+msgid "Description: {0}"
+msgstr "描述：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} 轨迹"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+#: build/trans_presets.java:3270
+msgid "Description"
+msgstr "描述"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+msgid "Timespan"
+msgstr "时间跨度"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+msgid "Length"
+msgstr "长度"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
+msgid "Length: "
+msgstr "长度： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} 路线， "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} 航点"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
+msgid "Convert to data layer"
+msgstr "转换为数据图层"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>上传未经处理的 GPS 数据做为地图数据被认为是有坏处的。<br>如果您想要上传"
+"轨迹，请看这里："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
+#, java-format
+msgid "Converted from: {0}"
+msgstr "转换自：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
+msgid "Download from OSM along this track"
+msgstr "从 OSM 沿这条轨迹下载"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
+msgid "Download everything within:"
+msgstr "下载这里面的每个对象："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
+#, java-format
+msgid "{0} meters"
+msgstr "{0} 公尺"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
+msgid "Maximum area per request:"
+msgstr "每个要求最大区域："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} 平方公里"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
+msgid "Download near:"
+msgstr "下载接近："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+msgid "track only"
+msgstr "只有轨迹"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+msgid "waypoints only"
+msgstr "只有航点"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
+msgid "track and waypoints"
+msgstr "轨迹与航点"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>这个动作会发出 {0} 个<br>个别的下载要求。您是否希望<br>继续?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
+msgid "No GPX track available in layer to associate audio with."
+msgstr "在图层中没有可用的 GPX 轨迹可供音效关联。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr "部分航点的时间戳记早于轨迹起点或晚于终点会被忽略或是转到起点。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr "部分航点离轨迹太远而无法明显判断其时间者会被忽略。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "自定义线条的绘制"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "使用全域设定值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "在这个图层的各点之间绘出线条。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "在这个图层的各点之间不要绘出线条。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "选择线条绘制选项"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "自定义颜色"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "预设值"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "选择一种颜色"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "已命名点的标记"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} 的已命名轨迹点"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "输入音效"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>GPX 图层 \"{0}\" 中的数据已从服务器下载。<br>因为它的航点并不包含时间戳"
+"记，我们不能将它们与声音数据关联。</html>\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "不可能输入"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave 音效文件 (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} 的音效标记"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "输入图片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>GPX 图层 \"{0}\" 中的数据已从服务器下载。<br>因为它的航点并不包含时间戳"
+"记，我们不能将它们与照片关联。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
+#, java-format
+msgid "Data Layer {0}"
+msgstr "数据图层 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+msgid "outside downloaded area"
+msgstr "超出下载的区域"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#, java-format
+msgid "version {0}"
+msgstr "版本 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "警告：混合 0.6 和 0.5 数据会成为 0.5 版"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
+#, java-format
+msgid "There was {0} conflict detected."
+msgid_plural "There were {0} conflicts detected."
+msgstr[0] "检测到 {0} 个冲突。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
+msgid "Click to close this dialog and continue editing"
+msgstr "按这里关闭这个对话框并继续编辑"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] "{0} 已删除"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} 组成："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
+msgid "unset"
+msgstr "取消设定"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
+#, java-format
+msgid "API version: {0}"
+msgstr "API 版本： {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
+msgid "Convert to GPX layer"
+msgstr "转换为 GPX 图层"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+msgid "Dataset consistency test"
+msgstr "数据组合一致性测试"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
+msgid "No problems found"
+msgstr "没有发现问题"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
+msgid "Following problems found:"
+msgstr "发现下列问题："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>上传未经处理的 GPS 数据当作地图数据是不适当的。<br>如果您想要上传轨迹，"
+"请看这里：</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
+msgctxt "gps"
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "轨迹"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
+msgid "point"
+msgid_plural "points"
+msgstr[0] "点"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "有 {0} 个点的轨迹"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} 由 {1} 轨迹组成"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} 点"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "关联到 GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
+msgid "GPX Files (*.gpx *.gpx.gz)"
+msgstr "GPX 文件 (*.gpx *.gpx.gz)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
+#, java-format
+msgid "File {0} is loaded yet under the name \"{1}\""
+msgstr "文件 {0} 已经以 \"{1}\" 的名称载入了。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "当解析 {0} 时发生错误。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "无法读取 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
+msgid ""
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>配合您的 GPS 接收器拍照，它会显示时间。<br>在这里显示照片。<br>然后，根"
+"据您读取到的相片时间并选择时区<hr></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
+msgid "Photo time (from exif):"
+msgstr "相片时间 (来自 exif):"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
+msgid "Gps time (read from the above photo): "
+msgstr "Gps 时间(自上列相片读取)： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
+msgid " [dd/mm/yyyy hh:mm:ss]"
+msgstr " [dd/mm/yyyy hh:mm:ss]"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
+msgid "I am in the timezone of: "
+msgstr "我所在的时区： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
+msgid "No date"
+msgstr "没有日期"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
+msgid "Open another photo"
+msgstr "开启其他相片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
+msgid "Synchronize time from a photo of the GPS receiver"
+msgstr "从 GPS 接收器的相片同步时间"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+msgid ""
+"Error while parsing the date.\n"
+"Please use the requested format"
+msgstr ""
+"分析日期时发生错误。\n"
+"请使用要求的格式"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
+msgid "Invalid date"
+msgstr "无效的日期"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
+msgid "<No GPX track loaded yet>"
+msgstr "<尚未载入 GPX 轨迹>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
+msgid "GPX track: "
+msgstr "GPX 轨迹： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
+msgid "Open another GPX trace"
+msgstr "开启另一个 GPX 轨迹"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
+msgid ""
+"<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
+msgstr "<html>使用精准时钟的照片，<br>例如 GPS 接收器显示</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
+msgid "Auto-Guess"
+msgstr "自动猜测"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+msgid "Matches first photo with first gpx point"
+msgstr "将第一张照片与第一个 gpx 点配对"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+msgid "Manual adjust"
+msgstr "手动调整"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
+msgid "Override position for: "
+msgstr "覆盖此地点： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#, java-format
+msgid "Images with geo location in exif data ({0}/{1})"
+msgstr "在 Exif 数据中有地理位置的照片 ({0}/{1})"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
+#, java-format
+msgid "Images that are already tagged ({0}/{1})"
+msgstr "已加上标签的照片 ({0}/{1})"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
+msgid "Show Thumbnail images on the map"
+msgstr "在地图上显示图片缩图"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
+msgid "Timezone: "
+msgstr "时区： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
+msgid "Offset:"
+msgstr "位移："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+msgid "Correlate images with GPX track"
+msgstr "将图片与 GPX 轨迹关联"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+msgid "Correlate"
+msgstr "关联"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
+msgid "Invalid timezone"
+msgstr "无效的时区"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
+msgid "Invalid offset"
+msgstr "无效的移位"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
+msgid "Try Again"
+msgstr "再试一次"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
+msgid "No images could be matched!"
+msgstr "无法配对任何图片!"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
+msgid "No gpx selected"
+msgstr "尚未选择 gpx"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
+#, java-format
+msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
+msgid_plural ""
+"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
+msgstr[0] "<html>已比对 <b>{0}</b> / <b>{1}</b> 照片至 GPX 轨迹。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#, java-format
+msgid "Timezone: {0}"
+msgstr "时区：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
+#, java-format
+msgid "Minutes: {0}"
+msgstr "分：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
+#, java-format
+msgid "Seconds: {0}"
+msgstr "秒：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] "({0} 天的时间差异)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+msgid ""
+"An error occurred while trying to match the photos to the GPX track. You can "
+"adjust the sliders to manually match the photos."
+msgstr "在尝试比对相片与 GPX 轨迹时发生错误。您可以使用滑动钮来手动比对相片。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
+msgid "Matching photos to track failed"
+msgstr "比对相片至轨迹失败"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
+msgid "Adjust timezone and offset"
+msgstr "调整时区并补偿"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
+msgid "The selected photos do not contain time information."
+msgstr "选取的相片未包含时间信息。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
+msgid "Photos do not contain time information"
+msgstr "相片未包含时间信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
+msgid ""
+"The selected GPX track does not contain timestamps. Please select another "
+"one."
+msgstr "选取的 GPX 轨迹没有包含时间戳记。请选择另一个。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
+msgid "GPX Track has no time information"
+msgstr "GPX 轨迹没有时间信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
+msgid "You should select a GPX track"
+msgstr "您应该选择一个 GPX 轨迹"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
+msgid "No selected GPX track"
+msgstr "没有选取的 GPX 轨迹"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
+#, java-format
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"分析时区时发生错误。\n"
+"预期的格式：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
+#, java-format
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"在分析补偿时发生错误。\n"
+"预期的格式：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
+msgid "Extracting GPS locations from EXIF"
+msgstr "从 EXIF 中解出 GPS 位置"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
+msgid "Starting directory scan"
+msgstr "开始扫描目录"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
+msgid "One of the selected files was null"
+msgstr "选取的文件中有一个是 null"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+msgid "Read photos..."
+msgstr "读取相片..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
+#, java-format
+msgid "Reading {0}..."
+msgstr "正在读取 {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
+#, java-format
+msgid "Unable to get canonical path for directory {0}\n"
+msgstr "无法取得目录  {0} 的路径\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
+#, java-format
+msgid "Scanning directory {0}"
+msgstr "正在扫描目录 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
+#, java-format
+msgid "Found null file in directory {0}\n"
+msgstr "在目录 {0} 找到空的文件\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
+#, java-format
+msgid "Error while getting files from directory {0}\n"
+msgstr "从目录 {0} 取得文件时发生错误\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
+msgid "Geotagged Images"
+msgstr "有 Geotag 的图片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
+#, java-format
+msgid "{0} image loaded."
+msgid_plural "{0} images loaded."
+msgstr[0] "已载入 {0} 张图片。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
+#, java-format
+msgid "{0} was found to be GPS tagged."
+msgid_plural "{0} were found to be GPS tagged."
+msgstr[0] "发现 {0} 已有 GPS 标签。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
+msgid "Delete image file from disk"
+msgstr "从磁碟删除图片档"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+"<html><h3>是否从磁碟删除文件 {0}?<p>这个照片文件会永久消失!</h3></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
+msgid "Image file could not be deleted."
+msgstr "无法删除图片文件。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+msgid "No image"
+msgstr "没有图片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#, java-format
+msgid "Loading {0}"
+msgstr "正在载入 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#, java-format
+msgid "Error on file {0}"
+msgstr "文件 {0} 有错误"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
+msgid "Display geotagged images"
+msgstr "显示有地理标记的图片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
+msgid "Previous"
+msgstr "上一幅"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+msgid "Show previous Image"
+msgstr "显示前一张图片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#, java-format
+msgid "Geoimage: {0}"
+msgstr "地理照片：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
+msgid "Remove photo from layer"
+msgstr "从图层删除相片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+msgid "Delete File from disk"
+msgstr "从磁碟删除文件"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
+msgid "Next"
+msgstr "下一幅"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+msgid "Show next Image"
+msgstr "显示下一张图片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
+msgid "Center view"
+msgstr "置中查看"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
+msgid "Zoom best fit and 1:1"
+msgstr "最适与 1:1 缩放"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
+msgid "Move dialog to the side pane"
+msgstr "将对话框转到侧边窗格"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
+#, java-format
+msgid ""
+"\n"
+"Altitude: {0} m"
+msgstr ""
+"\n"
+"高度： {0} m"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
+#, java-format
+msgid ""
+"\n"
+"{0} km/h"
+msgstr ""
+"\n"
+"{0} 公里/小时"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:242
+#, java-format
+msgid ""
+"\n"
+"Direction {0}°"
+msgstr ""
+"\n"
+"方向 {0}°"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG 图片 (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
+msgid "gps marker"
+msgstr "gps 标记"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "标记"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} 由 {1} 标记组成"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "这个图层中没有既存的音效标记可位移。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "显示文字/图示"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "切换标记文字和图示的可见性状态。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
+msgid "Synchronize Audio"
+msgstr "同步音效"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr "当您在聆听同步队列时需要暂停音效。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "音效同步于点 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
+msgid "Unable to synchronize in layer being played."
+msgstr "在播放时无法于图层同步。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
+msgid "Make Audio Marker at Play Head"
+msgstr "在播放开头放置声音标记"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr "您需要在轨迹上想标记的点暂停音效。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"您需要播放开头拖放到要与播放的声音轨关联的 GPX 轨迹附近(在第一个标记之后)。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:225
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr "您需要按 SHIFT 拖放播放开头到声音标记或您想要同步的轨迹点上。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
+msgid "Unable to create new audio marker."
+msgstr "无法建立新的音效标记。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "尝试显示这个标记的 URL 时发生错误"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(URL 是： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "在显示 URL 时发生错误"
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:129
+msgid "Illegal dash pattern, values must be positive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:135
+msgid "Illegal dash pattern, at least one value must be > 0"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:102
+#, java-format
+msgid ""
+"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "警告：从 \"{0}\" 载入 Mappaint 样式失败。例外为：{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:105
+#, java-format
+msgid ""
+"Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "警告：从 \"{0}\" 解析 Mappaint 样式失败。例外为：{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:234
+msgid "Access Token Key:"
+msgstr "存取记号键："
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:246
+msgid "Access Token Secret:"
+msgstr "存取记号机密："
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr "在偏好设定中保存存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+"<html>选择将存取记号保存到 JOSM 偏好设定中。<br>取消选取则只会在这个 JOSM 作"
+"业阶段使用存取记号。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+msgid "Use default settings"
+msgstr "使用预设 设定值"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr "要求记号 URL："
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr "存取记号 URL："
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
+msgid "Authorize URL:"
+msgstr "验证 URL："
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr "按这里将 OAuth 设定值重设为预设值"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "按这里放弃将 OAuth 设定值重设为预设值"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+"<html>JOSM 即将把 OAuth 设定值重设为预设值。<br>目前自定义的设定值不会保存。"
+"</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr "覆盖自定义的 OAuth 设定值?"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr "全自动"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr "半自动"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:64
+msgid "Manual"
+msgstr "手动"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorizes the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+"<html>执行全自动的程序自 OSM 网站取得存取记号。<br>JOSM 会代表 JOSM 使用者存"
+"取 OSM 网站并且全自动<br>验证使用者以取得存取记号。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+"<html>如果您是在 JOSM 之外产生并取得存取记号的话，<br>请手动输入它。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:97
+msgid ""
+"Please enter your OSM user name and password. The password will <strong>not</"
+"strong> be saved in clear text in the JOSM preferences and it will be "
+"submitted to the OSM server <strong>only once</strong>. Subsequent data "
+"upload requests don't use your password any more."
+msgstr ""
+"请输入您的 OSM 使用者名称和密码。密码将<strong>不会</strong>以明文的方式保存"
+"在 JOSM 偏好设定，同时它也只会传送到 OSM 服务器<strong>一次</strong>。往后的"
+"数据上传要求不会再使用您的密码。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+msgid "Username: "
+msgstr "使用者名称： "
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:126
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+msgid "Password: "
+msgstr "密码： "
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:147
+msgid ""
+"<strong>Warning:</strong> The password is transferred <strong>once</strong> "
+"in clear text to the OSM website. <strong>Do not</strong> use a sensitive "
+"password until the OSM server provides an encrypted communication channel "
+"(HTTPS)."
+msgstr ""
+"<strong>警告：</strong>密码会有<strong>一次</strong>以明文传送到 OSM 网站。直"
+"到 OSM 服务器提供加密通讯频道 (HTTPS) 前<strong>不要</strong>使用重要的密码。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:173
+msgid "Granted rights"
+msgstr "取得权利"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:174
+msgid "Advanced OAuth properties"
+msgstr "进阶的 OAuth 属性"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:234
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:361
+msgid "Accept Access Token"
+msgstr "应用存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:235
+#, java-format
+msgid ""
+"<html>You have successfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html>"
+msgstr ""
+"<html>您已经成功的从 OSM 网站取回 OAuth 存取记号。请按 <strong>{0}</strong> "
+"应用这个记号。JOSM 会在往后的要求中使用它存取 OSM API。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:329
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Authorize now"
+msgstr "立即验证"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:331
+msgid "Click to redirect you to the authorization form on the JOSM web site"
+msgstr "按这里将您重新导向至 JOSM 验证网站"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:361
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:274
+msgid "Back"
+msgstr "返回"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:362
+msgid "Run the automatic authorization steps again"
+msgstr "再次执行自动授权步骤"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:376
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:231
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Test Access Token"
+msgstr "测试存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:405
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+msgid "Please enter your OSM user name"
+msgstr "请输入您的 OSM 使用者名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:407
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr "使用者名称不能为空白。请输入您的 OSM 使用者名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:426
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+msgid "Please enter your OSM password"
+msgstr "请输入您的 OSM 密码"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:428
+msgid "The password cannot be empty. Please enter your OSM password"
+msgstr "密码不能为空白。请输入您的 OSM 密码"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:438
+msgid "Authorize JOSM to access the OSM API"
+msgstr "授权 JOSM 能存取 OSM API"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:452
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
+msgstr ""
+"<html>从 OSM 服务器自动取得 OAuth 存取记号的<br>程序失败了。<br><br>请再试一"
+"次或选择别种授权程序，<br>例如：半自动成手动授权。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:458
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:474
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:498
+msgid "OAuth authorization failed"
+msgstr "OAuth 验证失败"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:467
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM was not able to build<br>a valid login URL "
+"from the OAuth Authorize Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:490
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+"<html>从 OSM 服务器自动取得 OAuth 存取记号的程序<br>失败。JOSM 无法登入 {0}"
+"<br>使用者：{1}。<br><br>请检查使用者名称和密码后再试一次。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
+#, java-format
+msgid ""
+"Please enter an OAuth Access Token which is authorized to access the OSM "
+"server ''{0}''."
+msgstr "请输入已获授权存取 OSM 服务器 \"{0}\" 的 OAuth 存取记号。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
+msgid "Save Access Token to preferences"
+msgstr "将存取记号保存到偏好设定"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
+msgid "Access Token"
+msgstr "存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119
+msgid "Advanced OAuth parameters"
+msgstr "进阶的 OAuth 参数"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121
+msgid "Enter the OAuth Access Token"
+msgstr "输入 OAuth 存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:122
+msgid "Enter advanced OAuth properties"
+msgstr "输入进阶的 OAuth 属性"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorized to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+"<html><body>请输入授权存取 OSM 服务器 \"{0}\" 的 OAuth 存取记号。</body></"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
+msgid "Please enter an Access Token Key"
+msgstr "请输入存取记号键"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr "存取记号键不能为空白。请输入存取记号键"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
+msgid "Please enter an Access Token Secret"
+msgstr "请输入存取记号机密"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr "存取记号机密不能为空白。请输入存取记号机密"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:438
+msgid "Click to test the Access Token"
+msgstr "点击以测试存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:115
+#, java-format
+msgid ""
+"With OAuth you grant JOSM the right to upload map data and GPS tracks on "
+"your behalf (<a href=\"{0}\">more info...</a>)."
+msgstr ""
+"使用 OAuth 您会得到以自己的身分在 JOSM 上传地图数据和 GPS 轨迹的权限 (<a "
+"href=\"{0}\">更多信息...</a>)。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:126
+msgid "Please select an authorization procedure: "
+msgstr "请选择一种授权程序： "
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:244
+#, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "取得 \"{0}\" 的存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:344
+msgid "Close the dialog and cancel authorization"
+msgstr "关闭对话框并取消授权"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:363
+msgid "Close the dialog and accept the Access Token"
+msgstr "关闭对话框并应用存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr "警告：无法取消执行中的 OAuth 操作"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr "正从 \"{0}\" 取回 OAuth 要求记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr "正从 \"{0}\" 取回 OAuth 存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
+#, java-format
+msgid "OSM website did not return a session cookie in response to ''{0}'',"
+msgstr "OSM 网站并未传回 session cookie 回应 \"{0}\" ，"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr "无法以使用者 \"{0}\" 密码 \"***\" 验证为 OAuth 使用者"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
+#, java-format
+msgid "Failed to authorize OAuth request  ''{0}''"
+msgstr "无法验证 OAuth 要求 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr "正在 OSM 网站验证 OAuth 要求记号 \"{0}\" ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
+msgid "Initializing a session at the OSM website..."
+msgstr "正在初始化 OSM 网站的 session..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr "正在验证使用者 \"{0}\" 的 session ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
+#, java-format
+msgid "Authorizing request token ''{0}''..."
+msgstr "正在验证要求记号 \"{0}\" ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr "正在登出 session  \"{0}\" ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr "允许上传地图数据"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr "选择以使 JOSM 有权以您的身分上传地图数据"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr "允许上传 GPS 轨迹"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr "选择以使 JOSM 有权以您的身分上传 GPS 轨迹"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr "允许下载您的私人 GPS 轨迹"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr "选择以使 JOSM 有权下载您的私人 GPS 轨迹到 JOSM 图层"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+msgid "Allow to read your preferences"
+msgstr "允许读取您的偏好设定"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr "选择以使 JOSM 有权读取您服务器的偏好设定"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr "允许写入您的偏好设定"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr "选择以使 JOSM 有权写入您服务器的偏好设定"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr "正在取回 OAuth 存取记号..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr "<html>从 \"{0}\" 取回 OAuth 存取记号失败。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+msgid "Request Failed"
+msgstr "要求已失败"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr "正在取回 OAuth 要求记号..."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr "<html>从 \"{0}\" 取回 OAuth 要求记号失败。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:83
+msgid "Display Advanced OAuth Parameters"
+msgstr "显示进阶的 OAuth 参数"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:369
+msgid "Retrieve Request Token"
+msgstr "取回要求记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>请点击 <strong>{0}</strong> 从 \"{1}\" 取回 OAuth 要求记号。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr "<html>步骤 1/3：取回 OAuth 要求记号</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205
+msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
+msgstr "<html>步骤 2/3：验证并取回存取记号</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228
+msgid "Request Access Token"
+msgstr "要求存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220
+#, java-format
+msgid ""
+"<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
+"authorization page in an external browser. Please login with your OSM "
+"username and password and follow the instructions to authorize the Request "
+"Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorize URL and paste it into the address field of your browser."
+"</html>"
+msgstr ""
+"<html>JOSM 成功的取回要求记号。JOSM 现在会在外部浏览器中开启验证网页。请以您"
+"的 OSM 使用者名称和密码登入并按照指示授权给要求记号。接着切换回这个对话框并点"
+"击 <strong>{0}</strong><br><br>如果执行外部浏览器失败，您可以复制下列验证 "
+"URL 并将它贴到浏览器的位址列中。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
+msgid "Go back to step 1/3"
+msgstr "回到步骤 1/3"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr "<html>步骤 3/3：成功的取回存取记号</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306
+msgid ""
+"<html>JOSM has successfully retrieved an Access Token. You can now accept "
+"this token. JOSM will use it in the future for authentication and "
+"authorization to the OSM server.<br><br>The access token is: </html>"
+msgstr ""
+"<html>JOSM 已成功的取回存取记号。您现在可以应用这个记号。JOSM 往后会用它进行"
+"与 OSM 服务器的验证。<br><br>存取记号为：</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
+msgid "Restart"
+msgstr "重新启动"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr "点击以取回要求记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:402
+msgid "Retrieve Access Token"
+msgstr "取回存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr "点击以取回存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr "正在测试 OAuth 存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr "以存取记号键 \"{0}\" 取回使用者详细数据被拒绝。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
+msgstr "以存取记号键 \"{0}\" 取回使用者详细数据被禁止。"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server "
+"at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
+"''{3}''.</html>"
+msgstr ""
+"<html>成功的使用存取记号 \"{0}\" 存取<br>OSM 服务器 \"{1}\"。<br>您现在是以使"
+"用者 \"{2}\" id \"{3}\" 存取 OSM 服务器。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+msgid "Success"
+msgstr "成功"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorized. You will "
+"not<br>be able to access any protected resource on this server using this "
+"token.</html>"
+msgstr ""
+"<html>无法存取 OSM 服务器 \"{0}\"<br>存取记号为 \"{0}\"。<br>服务器将存取记号"
+"视为未授权而拒绝。您将<br>无法使用这个记号存取服务器上任何受保护的资源。</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+msgid "Test failed"
+msgstr "测试失败"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+"<html>存取记号 \"{1}\" 是用于 OSM 服务器 \"{0}\"。<br>然而，以这个记号测试取"
+"回使用者详细数据却失败了。<br>依据这个记号获得的权限您仍有可能使用它<br>上传"
+"数据、GPS 轨迹和/或存取其他受保护的资源。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr "记号允许限制的存取"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current user from the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+"<html>无法从 OSM 服务器 \"{0}\" 取回关于目前使用者的信息。<br>这可能是测试的"
+"存取记号造成的问题，但<br>也可能是否应服务器组态的问题。请小心检查服务器"
+"<br>URL 和您的互联网网络连接。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+"<html>无法使用记号 \"{1}\" 签署用于 OSM 服务器 \"{0}\" 的要求。<br>这个记号可"
+"能是无效的。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM could not decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>这个测试失败了，因为服务器回应了内部的错误。<br>JOSM 无法决定记号是否有"
+"效。请稍后再试一次。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+msgid "Retrieving user info..."
+msgstr "正在取回使用者信息..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "进阶的偏好设定"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "直接设定偏好设定项目。请小心使用!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
+msgid "Search: "
+msgstr "查找： "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+msgid "Current value is default."
+msgstr "目前的数值是预设值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "预设值是 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "预设数值目前不明(设定值尚未使用)。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+msgid "Please select the row to edit."
+msgstr "请选择要编辑的列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "{0} 的新数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:101
+msgid "Please select the row to delete."
+msgstr "请选择要删除的列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
+msgid "Enter a new key/value pair"
+msgstr "输入新的设定键/数值配对"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "显示音效菜单。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "标签音效(及图片、网页)标记。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "显示即时音效追踪。"
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
+msgid "Explicit waypoints with valid timestamps."
+msgstr "具有效时间戳记的明确航点。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "以轨迹位置判断明确航点的时间"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Named trackpoints."
+msgstr "已命名的轨迹点。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Modified times (time stamps) of audio files."
+msgstr "音效文件的修改次数(时间戳记)。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "轨迹的开头(如果没有其他的标记可用就会这么做)。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:52
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "显示或隐藏主要菜单列的音效菜单项目。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:57
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr "显示会移动的图示来显示出目前播放的音效所记录同步于轨迹上的点。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:62
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr "在音效(和图片、网页)标记的按钮图示旁放上文字标签。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:65
+msgid "When importing audio, make markers from..."
+msgstr "输入音效时，由此制作标记..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:74
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr "输入音效时，将它应用到 GPX 图层的任何航点中。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr "从轨迹点(非明确的航点)自动建立音效标记，并加上名称或描述。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:84
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr "依据每个输入的音效 WAV 文件修改的时间在轨迹上的位置建立音效标记。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:93
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr "当按下相对的加速快转或倒转时的秒数"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:94
+msgid "Forward/back time (seconds)"
+msgstr "快转/倒转时间(秒)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:98
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr "快速快转时速度的倍数"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid "Fast forward multiplier"
+msgstr "高速快转倍数"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:103
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "Lead-in time (seconds)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:108
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr "声音录制器耗费时间与实际耗费时间的比例"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid "Voice recorder calibration"
+msgstr "录音机校准"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
+msgid "Color"
+msgstr "颜色"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
+#, java-format
+msgid "Paint style {0}: {1}"
+msgstr "绘画样式 {0}：{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
+msgid "Choose"
+msgstr "选择"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "选择 {0} 的颜色"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
+msgid "Set to default"
+msgstr "设为预设值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
+msgid "Set all to default"
+msgstr "全部设为预设值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
+msgid "Colors used by different objects in JOSM."
+msgstr "在 JOSM 中用于不同对象的颜色。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
+msgid "Colors"
+msgstr "颜色"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:267
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:270
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:308
+msgid "All"
+msgstr "全部"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Local files"
+msgstr "本地文件"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "None"
+msgstr "没有"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+msgid "Force lines if no segments imported."
+msgstr "如果没有输入区段时强制绘出的线条。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Draw large GPS points."
+msgstr "绘出大型 GPS 点。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+msgid "Draw a circle form HDOP value."
+msgstr "从 HDOP 数值绘制圆形。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+msgid "Velocity (red = slow, green = fast)"
+msgstr "速率(红 = 慢，绿 = 快)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr "位置的准确误差(红 = 高，绿 = 低，如果可用的话)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+msgid "Single Color (can be customized for named layers)"
+msgstr "单一颜色(可以为已命名的图层自定义)"
+
+#. item "Aerialway/Pylon" text "Name"
+#. <separator/>
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: build/trans_presets.java:1332
+msgid "Car"
+msgstr "汽车"
+
+#. item "Barriers/Bollard" check "Foot"
+#. item "Barriers/Cattle Grid" check "Foot"
+#. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
+#. item "Barriers/Gate" check "Foot"
+#. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
+#. item "Barriers/Sally Port" check "Foot"
+#. item "Car/Sharing" text "Operator"
+#. item "Public Transport/Subway Entrance" check "Wheelchair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: build/trans_presets.java:387 build/trans_presets.java:497
+#: build/trans_presets.java:754 build/trans_presets.java:773
+#: build/trans_presets.java:787 build/trans_presets.java:809
+#: build/trans_presets.java:846 build/trans_presets.java:859
+#: build/trans_presets.java:871 build/trans_presets.java:883
+#: build/trans_presets.java:895 build/trans_presets.java:907
+#: build/trans_presets.java:917 build/trans_presets.java:926
+#: build/trans_presets.java:935 build/trans_presets.java:1406
+#: build/trans_presets.java:1472
+msgid "Bicycle"
+msgstr "单车"
+
+#. item "Ways/Path" check "Oneway"
+#. item "Barriers/Bollard" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Cattle Grid" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Spikes" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Lift Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Bump Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. <space />
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: build/trans_presets.java:388 build/trans_presets.java:496
+#: build/trans_presets.java:753 build/trans_presets.java:772
+#: build/trans_presets.java:786 build/trans_presets.java:808
+#: build/trans_presets.java:845 build/trans_presets.java:858
+#: build/trans_presets.java:870 build/trans_presets.java:882
+#: build/trans_presets.java:894 build/trans_presets.java:906
+#: build/trans_presets.java:916 build/trans_presets.java:925
+#: build/trans_presets.java:934
+msgid "Foot"
+msgstr "步行"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+msgid "Draw Direction Arrows"
+msgstr "绘出方向箭头"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+msgid "Fast drawing (looks uglier)"
+msgstr "快速绘制(看起来较丑)"
+
+#. only interesting directions
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr "只有重要的方向提示(例如单行道标签)。"
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+msgid "Only on the head of a way."
+msgstr "只在路径的开头。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+msgid "Draw segment order numbers"
+msgstr "绘制区段顺序编号"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+msgid "Draw boundaries of downloaded data"
+msgstr "绘出已下载数据的边界"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+msgid "Draw virtual nodes in select mode"
+msgstr "在选择模式绘出虚拟节点"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+msgid "Draw inactive layers in other color"
+msgstr "将未使用的图层以其他颜色绘制"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+msgid "Smooth map graphics (antialiasing)"
+msgstr "平滑化地图图片(反锯齿)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Create markers when reading GPX."
+msgstr "读取 GPX 时建立标记。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "作者"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Desc"
+msgstr "柴油"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "北"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr "开启 GPX 图层时自动从任何航点制作标记图层。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+msgid "Draw lines between raw GPS points"
+msgstr "在原始 GPS 点之间绘出线条"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+msgid ""
+"Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
+"draw all lines."
+msgstr "绘出本地文件线条的最大长度(公尺)。设为 \"-1\" 则绘出所有的线条。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+msgid "Maximum length for local files (meters)"
+msgstr "本地文件最大长度(公尺)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+msgid ""
+"Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
+msgstr "绘出线条的最大长度(公尺)。设为 \"-1\" 则绘出所有的线条。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+msgid "Maximum length (meters)"
+msgstr "最大长度(公尺)"
+
+#. forceRawGpsLines
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
+msgstr "如果输入的数据不含线条信息，仍强制绘出线条。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+msgid "Draw direction arrows for lines, connecting GPS points."
+msgstr "绘出线条的方向箭头，连接 GPS 点。"
+
+#. drawGpsArrowsFast
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+msgid "Draw the direction arrows using table lookups instead of complex math."
+msgstr "使用表格查询的方式绘制方向箭头而非复杂的数学运算。"
+
+#. drawGpsArrowsMinDist
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid ""
+"Do not draw arrows if they are not at least this distance away from the last "
+"one."
+msgstr "如果没有距离最后一个至少这个距离就不要绘出箭头。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+msgid "Minimum distance (pixels)"
+msgstr "最小距离(像素)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+msgid "Draw larger dots for the GPS points."
+msgstr "将 GPS 点以较大的点绘制。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+msgid ""
+"All points and track segments will have the same color. Can be customized in "
+"Layer Manager."
+msgstr "所有的点和轨迹区段都使用同样的颜色。可以在图层管理程序自定义。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+msgid "Colors points and track segments by velocity."
+msgstr "依速度来为点和轨迹区段上色。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+msgid ""
+"Colors points and track segments by dilution of position (HDOP). Your "
+"capture device needs to log that information."
+msgstr "为地点精度 (HDOP) 的点和轨迹区段上色。您的捕捉装置需要能记录这项信息。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+msgid "Allows to tune the track coloring for different average speeds."
+msgstr "允许依不同的平均速度调整轨迹颜色。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+msgid "Track and Point Coloring"
+msgstr "轨迹与点的颜色"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "航点描述"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgid "GPS Points"
+msgstr "GPS 点"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+msgid "Draw direction hints for way segments."
+msgstr "绘出路径区段的方向提示。"
+
+#. segment order number
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+msgid "Draw the order numbers of all segments within their way."
+msgstr "绘出所有区段在其路径中的顺序编号。"
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "在地图检视应用平滑化以产生较平滑的外观。"
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "绘出从服务器下载数据的边界。"
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr "为了容易修改路径在选择模式中绘出虚拟节点。"
+
+#. background layers in inactive color
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+msgid "Draw the inactive data layers in a different color."
+msgstr "将未使用的数据图层以不同的颜色绘制。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+msgid "OSM Data"
+msgstr "OSM 数据"
+
+#. Show splash screen on startup
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:79
+msgid "Show splash screen at startup"
+msgstr "启动时显示欢迎画面"
+
+#. Show ID in selection
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:84
+msgid "Show object ID in selection lists"
+msgstr "在选择区域清单显示对象 ID"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+msgid "Show localized name in selection lists"
+msgstr "在选择清单中显示本地化的名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:93
+msgid "Draw rubber-band helper line"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:42
+msgid "Modeless working (Potlatch style)"
+msgstr "无模式运作(potlath 式)"
+
+#. Show localized names
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89
+msgid "Show localized name in selection lists, if available"
+msgstr "如果可以，在选择清单中显示本地化的名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+msgid "Do not require to switch modes (potlatch style workflow)"
+msgstr "不需要切换模式(potlath 式工作流程)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
+msgid "Look and Feel"
+msgstr "外观与感觉"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:45
+msgid "Language"
+msgstr "语言"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:103
+msgid "Default (Auto determined)"
+msgstr "预设值(自动决定)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:134
+msgid "Enable built-in defaults"
+msgstr "启用内建预设值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+msgid "Enable built-in icon defaults"
+msgstr "启用内建图示预设值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+msgid "Used style"
+msgstr "使用者样式"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+msgid "Map Paint Styles"
+msgstr "地图绘制样式"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
+#, java-format
+msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid_plural ""
+"The following {0} plugins have been downloaded <strong>successfully</strong>:"
+msgstr[0] "下列 {0} 插件已<strong>成功的</strong>下载："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
+#, java-format
+msgid "Downloading the following plugin has <strong>failed</strong>:"
+msgid_plural ""
+"Downloading the following {0} plugins has <strong>failed</strong>:"
+msgstr[0] "下载以下 {0} 插件<strong>失败</strong>："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
+msgid "Search:"
+msgstr "查找："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
+msgid "Enter a search expression"
+msgstr "请输入查找词句"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
+msgid "Plugin update policy"
+msgstr "插件更新原则"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:194
+msgid "Accept the new plugin sites and close the dialog"
+msgstr "应用新的插件网站并关闭对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209
+msgid "Configure Plugin Sites"
+msgstr "设定插件网站"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:274
+msgid "Download list"
+msgstr "下载清单"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:275
+msgid "Download the list of available plugins"
+msgstr "下载可用的插件清单"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:321
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:344
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:834
+msgid "Update plugins"
+msgstr "更新插件"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:304
+msgid "Update the selected plugins"
+msgstr "更新选取的插件"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:315
+msgid "Please restart JOSM to activate the downloaded plugins."
+msgstr "请重新启动 JOSM 让下载的插件生效。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:331
+msgid ""
+"All installed plugins are up to date. JOSM does not have to download newer "
+"versions."
+msgstr "所有安装的插件都是最新的。JOSM 不需要下载新版本。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:332
+msgid "Plugins up to date"
+msgstr "插件已是最新"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:400
+msgid "Configure sites..."
+msgstr "设定网站..."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:401
+msgid "Configure the list of sites where plugins are downloaded from"
+msgstr "设定用来下载插件的网站清单"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:463
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:475
+msgid "Add JOSM Plugin description URL."
+msgstr "加入 JOSM 插件描述 URL。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:476
+msgid "Enter URL"
+msgstr "请输入 URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+msgid "Please select an entry."
+msgstr "请选择一个项目。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:497
+msgid "Edit JOSM Plugin description URL."
+msgstr "编辑 JOSM 插件描述 URL。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:498
+msgid "JOSM Plugin description URL"
+msgstr "JOSM 插件描述 URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+msgid "disabled"
+msgstr "已停用"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
+msgid "no modifier"
+msgstr "没有修饰键"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
+msgstr "<h1><a name=\"top\">键盘快捷键</a></h1>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
+msgid ""
+"<p>Please note that shortcut keys are assigned to the actions when JOSM is "
+"started. So you need to <b>restart</b> JOSM to see your changes.</p>"
+msgstr ""
+"<p>请注意快捷键会在 JOSM 启动时指派动作。因此您需要<b>重新启动</b> JOSM 来看"
+"看您的变更。</p>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
+msgid ""
+"<p>Furthermore, the shortcuts are activated when the actions are assigned to "
+"a menu entry of a button for the first time. So some of your changes may "
+"become active even without restart --- but also without collision handling. "
+"This is another reason to <b>restart</b> JOSM after making any changes here."
+"</p>"
+msgstr ""
+"<p>此外，快捷键会在动作第一次指派到按钮的菜单项目时生效。因此您的变更有时不需"
+"重新启动就可以使用 --- 但是若与其他处理冲突就不行了。这也是另一个要求在这里进"
+"行变更后必须<b>重新启动</b> JOSM 的理由。</p>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
+msgid ""
+"<p>You may notice that the key selection list on the next page lists all "
+"keys that exist on all kinds of keyboards Java knows about, not just those "
+"keys that exist on your keyboard. Please only use values that correspond to "
+"a real key on your keyboard. If your keyboard has no ''Copy'' key (PC "
+"keyboard do not have them, Sun keyboards do), then do not use it. Also there "
+"are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. "
+"'':''/Colon). Please do not use them either, use the base key ('';''/"
+"Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) instead. "
+"Not doing so may result in conflicts, as there is no way for JOSM to know "
+"that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard.</"
+"p>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+msgid "<h1>Modifier Groups</h1>"
+msgstr "<h1>修饰键群组</h1>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
+msgid ""
+"<p>The last page lists the modifier keys JOSM will automatically assign to "
+"shortcuts. For every of the four kinds of shortcuts there are three "
+"alternatives. JOSM will try those alternatives in the listed order when "
+"managing a conflict. If all alternatives result in shortcuts that are "
+"already taken, it will assign a random shortcut instead.</p>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
+msgid ""
+"<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
+"encountered.</p>"
+msgstr ""
+
+#. scroll up
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
+msgid "Read First"
+msgstr "请先阅读"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
+msgid "Use default"
+msgstr "使用预设值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
+msgid "Disable"
+msgstr "停用"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
+msgid "Key:"
+msgstr "按键："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
+msgid "Attention: Use real keyboard keys only!"
+msgstr "注意：只使用真实的键盘按键!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
+msgid "Keyboard Shortcuts"
+msgstr "键盘快捷键"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
+msgid "Edit Shortcuts"
+msgstr "编辑快捷键"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
+msgid "Primary modifier:"
+msgstr "第一修饰键："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
+msgid "Secondary modifier:"
+msgstr "第二修饰键："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
+msgid "Tertiary modifier:"
+msgstr "第三修饰键："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
+msgid "Menu Shortcuts"
+msgstr "菜单快捷键"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
+msgid "Hotkey Shortcuts"
+msgstr "热键快捷键"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
+msgid "Subwindow Shortcuts"
+msgstr "子视窗快捷键"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
+msgid "Modifier Groups"
+msgstr "修饰键群组"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:93
+msgid "Close the preferences dialog and discard preference updates"
+msgstr "关闭偏好设定视窗并放弃偏好设定的更新"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:111
+msgid "Save the preferences and close the dialog"
+msgstr "保存偏好设定并关闭对话框"
+
+#. some common tabs
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:62
+msgid "Display Settings"
+msgstr "显示设定值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:62
+msgid ""
+"Various settings that influence the visual representation of the whole "
+"program."
+msgstr "各种影响整个程序视觉呈现的设定值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:63
+msgid "Connection Settings"
+msgstr "连接设定值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:63
+msgid "Connection Settings for the OSM server."
+msgstr "OSM 服务器的连接设定值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:64
+msgid "Map Settings"
+msgstr "地图设定值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:64
+msgid "Settings for the map projection and data interpretation."
+msgstr "地图投影与数据转译设定值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:65
+msgid "Audio Settings"
+msgstr "音效设定值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:65
+msgid "Settings for the audio player and audio markers."
+msgstr "音效播放程序与音效标记的设定值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:66
+msgid "Configure available plugins."
+msgstr "设定可用的插件。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:143
+msgid "Download plugins"
+msgstr "下载插件"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:175
+msgid "You have to restart JOSM for some settings to take effect."
+msgstr "您必须重新启动 JOSM 才能让某些设定值生效。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "投影方法"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "投影法代码"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
+msgid "Display coordinates as"
+msgstr "显示坐标为"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "要进行测量的图层"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
+msgid "Map Projection"
+msgstr "地图投影"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
+#, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr "无法使用投影法 {0}。改用麦卡托投影"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+msgid "Authentication"
+msgstr "验证"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+msgid "Proxy settings"
+msgstr "代理服务器设定值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr "文件备份"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr "设定您的身分识别与如何在 OSM 服务器验证"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr "设定是否使用代理服务器"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr "设定是否建立备份文件"
+
+#. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
+#. icon licence: GPL
+#. icon designer: Paolino, http://www.paolinoland.it/
+#. icon original filename: keyboard.png
+#. icon original size: 128x128
+#. modifications: icon was cropped, then resized
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
+msgid "Shortcut Preferences"
+msgstr "快捷键偏好设定"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
+msgid "Changing keyboard shortcuts manually."
+msgstr "手动改变键盘快捷键。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
+msgid "Action"
+msgstr "动作"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
+msgid "Shortcut"
+msgstr "快捷键"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:156
+msgid "Active styles"
+msgstr "使用中样式"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:166
+#, java-format
+msgid "Available styles (from {0})"
+msgstr "可用的样式 (来自 {0})"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:172
+msgid "Icon paths"
+msgstr "图示路径"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:425
+#, java-format
+msgid "Short Description: {0}"
+msgstr "简短说明：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:425
+#, java-format
+msgid "URL: {0}"
+msgstr "URL：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:427
+#, java-format
+msgid "Author: {0}"
+msgstr "作者：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:430
+#, java-format
+msgid "Webpage: {0}"
+msgstr "网页：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:436
+#, java-format
+msgid "Version: {0}"
+msgstr "版本：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:641
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
+msgid "New"
+msgstr "新增"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+msgid "Add a filename or an URL of an active style"
+msgstr "为使用的样式加入文件名称或 URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:465
+msgid "Remove the selected styles from the list of active styles"
+msgstr "从使用中样式清单中删除选取的样式"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:486
+msgid "Edit the filename or URL for the selected active style"
+msgstr "编辑使用的样式的文件名称或 URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:508
+msgid "Add the selected available styles to the list of active styles"
+msgstr "将选取的样式加入使用中样式清单"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:531
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr "从 \"{0}\" 重新载入可用的样式清单"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:642
+msgid "Add a new icon path"
+msgstr "加入新的图示路径"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:655
+msgid "Remove the selected icon paths"
+msgstr "删除选取的图示路径"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:676
+msgid "Edit the selected icon path"
+msgstr "编辑选取的图示路径"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:721
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "从 \"{0}\" 载入样式来源"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:743
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>无法从这里载入样式来源清单：<br>\"{0}\"。<br><br>详细数据 (未翻译):<br>"
+"{1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:783
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:815
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr "警告：样式清单 \"{0}\" 中项目的格式不正确。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
+#, java-format
+msgid ""
+"Could not read tagging preset source: {0}\n"
+"Do you want to keep it?"
+msgstr ""
+"无法读取标签预设组合来源：{0}\n"
+"您确定要保留它?"
+
+#. Should not happen, but at least show message
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:82
+#, java-format
+msgid "Could not read tagging preset source {0}"
+msgstr "无法读取标签预设组合来源 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86
+#, java-format
+msgid ""
+"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
+"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] {3}</"
+"table></html>"
+msgstr ""
+"<html>标签预设组合来源 {0} 可以载入但是它包含错误。您是否确定要使用它?"
+"<br><br><table width=600>错误为： [{1}:{2}] {3}</table></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#, java-format
+msgid ""
+"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
+"it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
+msgstr ""
+"<html>无法分折标签预设组合来源：{0}。您是否确定要使用它?<br><br><table "
+"width=400>错误为： [{1}:{2}] {3}</table></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96
+#, java-format
+msgid ""
+"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
+"really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
+msgstr ""
+"<html>标签预设组合来源 {0} 可以载入但是它包含错误。您是否确定要使用它?"
+"<br><br><table width=600>错误为：{1}</table></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100
+#, java-format
+msgid ""
+"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
+"it?<br><br><table width=600>Error is: {1}</table></html>"
+msgstr ""
+"<html>无法分折标签预设组合来源：{0}。您是否确定要使用它?<br><br><table "
+"width=600>错误为：{1}</table></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:132
+msgid "Sort presets menu"
+msgstr "排序预设组合菜单"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:144
+msgid "Tagging Presets"
+msgstr "加上预先组合标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+msgid "Actions"
+msgstr "动作"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+msgid "Separator"
+msgstr "分隔线"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+msgid "Toolbar"
+msgstr "工具列"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+msgid "Available"
+msgstr "可用"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+msgid "Action parameters"
+msgstr "动作参数"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+msgid "Parameter name"
+msgstr "参数名称"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+msgid "Parameter value"
+msgstr "参数数值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+msgid "Toolbar customization"
+msgstr "工具列自定义化"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+msgid "Customize the elements on the toolbar."
+msgstr "自定义工具列上的元件。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:65
+msgid "Plugin bundled with JOSM"
+msgstr "JOSM 随附插件"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:82
+msgid ""
+"Please click on <strong>Download list</strong> to download and display a "
+"list of available plugins."
+msgstr "请点击<strong>下载清单</strong>来下载并显示可用插件的清单。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:118
+#, java-format
+msgid "{0}: Version {1} (local: {2})"
+msgstr "{0}：版本 {1} (本地： {2})"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:113
+msgid "Ask before updating"
+msgstr "更新前询问"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
+msgid "Always update withouth asking"
+msgstr "永远不询问就更新"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:123
+msgid "Never update"
+msgstr "永不更新"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:84
+msgid ""
+"Please decide whether JOSM shall automatically update active plugins at "
+"startup after an update of JOSM itself."
+msgstr "请决定 JOSM 是否该在更新 JOSM 本身后于启动时自动更新使用中的插件。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96
+msgid "Update interval (in days):"
+msgstr "更新间隔 (以日计)："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:128
+msgid ""
+"Please decide whether JOSM shall automatically update active plugins after a "
+"certain periode of time."
+msgstr "请决定 JOSM 是否该在特定的期间之后自动更新使用中的插件。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr "正在测试 OSM API URL \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+"<html> \"{0}\" 不是有效的 OSM API URL。<br>请检查拼写后再验证一次。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr "无效的 API URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+"<html>无法建立 URL \"{0}\" 来验证 OSM API 服务器。<br>请检查 \"{1}\" 的拼写后"
+"再验证一次。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>无法建立连接到 URL \"{0}\"。<br>请检查 \"{1}\" 的拼写与您的互联网网络连"
+"接后再验证一次。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+msgid "Connection to API failed"
+msgstr "连接至 API 失败"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+"<html>无法从这个 OSM API 服务器取回更改组合的清单：<br>\"{1}\"。服务器传回代"
+"码为 {0} 而非 200。<br>请检查 \"{1}\" 的拼写后再验证一次。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' did not return a valid response.<br>It "
+"is likely that ''{0}'' is not an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+"<html>OSM API 服务器 \"{0}\" 并未传回有效的回应。<br>可能 \"{0}\" 不是 OSM "
+"API 服务器。<br>请检查 \"{0}\" 的拼写并再验证一次。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr "使用基本验证"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr "选择以使用您的 OSM 使用者名称和密码进行 HTTP 验证"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+msgid "Use OAuth"
+msgstr "使用 OAuth"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr "选择以使用 OAuth 做为验证机制"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+"警告：在偏好设定 \"{0}\" 中有不支持的数值，发现 \"{1}\"。使用的验证方式为\"基"
+"础验证\"。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "保留备份文件"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "保存时，在备份文件名称的结尾加上 ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+msgid "OSM username:"
+msgstr "OSM 使用者名称："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+msgid "OSM password:"
+msgstr "OSM 密码："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html><body><p class=\"warning-body\"><strong>警告：</strong>密码是以纯文字保"
+"存在 JOSM 偏好设定文件中。此外，它每次都是以<strong>未加密</strong>的方式随着"
+"每个要求传送到 OSM 服务器。<strong>请勿使用重要的密码。</strong></p></body></"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr "警告：无法从凭证管理程序取回 OSM 凭证。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:183
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr "目前的凭证管理程序类型为 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:139
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr "警告：无法将 OSM 凭证保存到凭证管理程序。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr "警告：无法从凭证管理程序取回 OAuth 存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr "警告：无法将 OAuth 存取记号保存到凭证管理程序"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:187
+msgid ""
+"You do not have an Access Token yet to access the OSM server using OAuth. "
+"Please authorize first."
+msgstr "您还没有能用 OAuth 存取 OSM 服务器的存取记号。请先获得授权。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr "您已经有能用 OAuth 存取 OSM 服务器的存取记号。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:258
+msgid "Save to preferences"
+msgstr "保存到偏好设定"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:307
+msgid "Click to step through the OAuth authorization process"
+msgstr "点击以进行 OAuth 授权程序"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid "New Access Token"
+msgstr "新存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:332
+msgid ""
+"Click to step through the OAuth authorization process and generate a new "
+"Access Token"
+msgstr "点击以进行 OAuth 授权程序并产生新的存取记号"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:357
+msgid "Click test access to the OSM server with the current access token"
+msgstr "点击以使用目前的存取记号进行对 OSM 服务器的测试存取"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:62
+#, java-format
+msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
+msgstr "<html>使用预设的 OSM 服务器 URL (<strong>{0}</strong>)</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:88
+msgid "OSM Server URL:"
+msgstr "OSM 服务器 URL："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Validate"
+msgstr "检验"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:153
+msgid "Test the API URL"
+msgstr "测试 API URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:169
+msgid "The API URL is valid."
+msgstr "这个 API URL 是有效的。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:174
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr "验证失败。API URL 似乎是无效的。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:235
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr "OSM API URL 不能为空白。请输入 OSM API URL。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:239
+msgid "The current value is not a valid URL"
+msgstr "目前的数值是无效的 URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:241
+msgid "Please enter the OSM API URL."
+msgstr "请输入 OSM API URL。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:179
+msgid "Host:"
+msgstr "主机："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:189
+msgctxt "server"
+msgid "Port:"
+msgstr "端口："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:126
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr "如果您的代理服务器需要验证，请输入使用者名称和密码。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
+msgid "Password:"
+msgstr "密码："
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "No proxy"
+msgstr "不使用代理服务器"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:242
+msgid "Use standard system settings"
+msgstr "使用标准系统设定值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+"使用标准的系统设定值 (已停用。使用 <tt>-Djava.net.useSystemProxies=true</tt> "
+"启动 JOSM 可以启用它)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
+msgid "Manually configure a HTTP proxy"
+msgstr "手动设定 HTTP 代理服务器"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:274
+msgid "Use a SOCKS proxy"
+msgstr "使用 SOCKS 代理服务器"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:316
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+"警告：JOSM 是设定为使用系统设定的代理服务器，但是 JVM 并未设定为可以取得它"
+"们。将偏好设定重设为\"不使用代理服务器\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:58
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:64
+msgid "multiple"
+msgstr "多个"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:500
+#, java-format
+msgid "Remove old keys from up to {0} object"
+msgid_plural "Remove old keys from up to {0} objects"
+msgstr[0] "删除 {0} 个对象之多的旧设定键"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:184
+msgid "Delete the selection in the tag table"
+msgstr "删除在标签表中的选择区域"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:276
+msgid "Add a new tag"
+msgstr "加入新标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+"损坏的预设组合 \"{0}-{1}\" - 在 display_values 中项目的数量必须和数值里的相同"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
+msgid "More information about this feature"
+msgstr "更多关于这个功能的信息"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
+#, java-format
+msgid "Unknown requisite: {0}"
+msgstr "不明的必需品：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+msgid "Available roles"
+msgstr "可用的角色"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+msgid "role"
+msgstr "角色"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+msgid "count"
+msgstr "计次"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+msgid "elements"
+msgstr "元素"
+
+#. space
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
+msgid "Optional Attributes:"
+msgstr "额外属性："
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
+#, java-format
+msgid "Unknown type: {0}"
+msgstr "不明的类型：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
+msgid "Preset role element without parent"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+msgid "Preset sub element without parent"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
+#, java-format
+msgid "Could not read tagging preset source: {0}"
+msgstr "无法读取标签预设组合来源：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#, java-format
+msgid "Error parsing {0}: "
+msgstr "分析 {0} 时发生错误： "
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
+#, java-format
+msgid "Elements of type {0} are supported."
+msgstr "类型 {0} 的元件已支持。"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
+#: ../plugins/terracer/src/terracer/TerracerAction.java:149
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "改变 {0} 个对象"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
+msgid "Nothing selected!"
+msgstr "尚未选择!"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
+msgid "Selection unsuitable!"
+msgstr "选择区域不合适!"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
+msgid "Apply Preset"
+msgstr "应用预设组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
+msgid "Change Properties"
+msgstr "改变属性"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
+#, java-format
+msgid "Preset group {1} / {0}"
+msgstr "预设组合 {1} / {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
+#, java-format
+msgid "Preset group {0}"
+msgstr "预设组合 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
+msgid "Search preset"
+msgstr "搜索预设组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
+msgid "Show preset search dialog"
+msgstr "显示预设组合搜索对话框"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
+msgid "Search presets"
+msgstr "搜索预设组合"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
+msgid "Show only applicable to selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
+msgid "Search in tags"
+msgstr "搜索关键字"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
+msgid "Min. latitude"
+msgstr "最小纬度"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:73
+msgid "Min. longitude"
+msgstr "最小经度"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:75
+msgid "Max. latitude"
+msgstr "最大纬度"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:77
+msgid "Max. longitude"
+msgstr "最大经度"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
+msgid ""
+"URL from www.openstreetmap.org (you can paste a download URL here to specify "
+"a bounding box)"
+msgstr "www.openstreetmap.org 的 URL (您可以在这里粘贴下载 URL 指定绑定方块)"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46
+msgid ""
+"The current value is not a valid OSM ID. Please enter an integer value > 0"
+msgstr "目前的数值不是有效的 OSM ID。请输入大于 0 的整数值"
+
+#: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
+msgid "All Formats"
+msgstr "所有的格式"
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:60
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
+msgid "Contacting OSM Server..."
+msgstr "正在连接 OSM 服务器..."
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "正在下载点 {0} 到 {1}..."
+
+#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
+#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
+#, java-format
+msgid ""
+"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"capabilities. Got ''{2}''"
+msgstr "警告：在服务器功能元素 \"{1}\" 的属性 \"{0}\" 数值无效。得到 \"{2}\""
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#, java-format
+msgid "Failed to parse date ''{0}'' replied by server."
+msgstr "解析服务器返回的日期 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87
+#, java-format
+msgid ""
+"Unexpected format of error header for conflict in changeset update. Got "
+"''{0}''"
+msgstr "在更改组合中冲突的错误标头有未预期的的格式。却收到 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:127
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:129
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:133
+#, java-format
+msgid "Illegal longitude value for parameter ''{0}'', got {1}"
+msgstr "参数 \"{0}\" 有不合格的经度数值，得到 {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:131
+#, java-format
+msgid "Illegal latitude value for parameter ''{0}'', got {1}"
+msgstr "参数 \"{0}\" 有不合格的纬度数值，得到 {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:294
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:299
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:301
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:308
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:314
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:319
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:325
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:330
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:341
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:348
+#, java-format
+msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
+msgstr "在更改组合查询 url 中有未预期的数值 \"{0}\" ，得到 {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:366
+msgid ""
+"Cannot create a changeset query including both the query parameters ''uid'' "
+"and ''display_name''"
+msgstr "不能同时使用查询参数 \"uid\" 和 \"display_name\" 建立更改组合查询"
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
+#, java-format
+msgid "Unsupported parameter ''{0}'' in changeset query string"
+msgstr "在更改组合查询字串中不支持的参数 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr "在偏好设定 \"{0}\" 中端口号有未预期的格式。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr "不会使用代理服务器。"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr "在偏好设定 \"{0}\" 中有无效的端口号。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr "警告：找不到偏好设定 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
+#, java-format
+msgid ""
+"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
+"use no proxy."
+msgstr ""
+"警告：发现未预期的偏好设定 \"{0}\" 数值。得到的数值是 \"{1}\"。将不使用代理服"
+"务器。"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
+#, java-format
+msgid ""
+"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
+"''{1}''."
+msgstr "警告：未预期的 HTTP 代理服务器参数。得到主机 \"{0}\" 和端口 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
+#, java-format
+msgid ""
+"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
+"''{1}''."
+msgstr "警告：未预期的 SOCKS 代理服务器参数。得到主机 \"{0}\" 和端口 \"{1}\"。"
+
+#. Just log something. The network stack will also throw an exception which will be caught
+#. somewhere else
+#.
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
+#, java-format
+msgid ""
+"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+msgstr "错误：以代理服务器 \"{0}\" 连接到 URI \"{1}\" 失败。例外为：{2}"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
+msgid ""
+"Warning: the JVM is not configured to lookup proxies from the system "
+"settings. The property ''java.net.useSystemProxies'' was missing at startup "
+"time.  Will not use a proxy."
+msgstr ""
+"警告：JVM 并未设定从系统设定值查询代理服务器。属性\"java.net.useSystemProxies"
+"\"在启动时遗失了。将不使用代理服务器。"
+
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
+msgid "Parsing response from server..."
+msgstr "正在分析服务器的回应..."
+
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#, java-format
+msgid "Unexpected XML element with name ''{0}''"
+msgstr "未预期的名称为 \"{0}\" 的 XML 元素"
+
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, java-format
+msgid "Could not export ''{0}''."
+msgstr "无法输出 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:40
+#, java-format
+msgid "Could not import ''{0}''."
+msgstr "无法输入 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:48
+msgid "Could not import files."
+msgstr "无法输入文件。"
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:62
+#, java-format
+msgid "<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>"
+msgstr "<html>无法读取文件 \"{0}\"。<br>错误为：<br>{1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76
+#, java-format
+msgid "<html>Could not read files.<br>Error is:<br>{0}</html>"
+msgstr "<html>无法读取文件。<br>错误为：<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr "注意：GPL 与 OSM 授权并不相容，请勿上传 GPL 授权的轨迹。"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:44
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:26
+msgid "GPX Files"
+msgstr "GPX 文件"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
+msgid "GPS track description"
+msgstr "gps 轨迹描述"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77
+msgid "Add author information"
+msgstr "加入作者信息"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80
+msgid "Real name"
+msgstr "本名"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88
+msgid "Copyright (URL)"
+msgstr "授权 {URL}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92
+msgid "Predefined"
+msgstr "预先定义的"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94
+msgid "Copyright year"
+msgstr "版权年份"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110
+msgid "Keywords"
+msgstr "设定键"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "输出选项"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+msgid "Export and Save"
+msgstr "输出并存档"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"输出时发生错误 {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:258
+msgid "Choose a predefined license"
+msgstr "选择预先定义的授权"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:134
+#, java-format
+msgid "Markers from {0}"
+msgstr "{0} 的标记"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
+#, java-format
+msgid ""
+"Error occured while parsing gpx file {0}. Only part of the file will be "
+"available"
+msgstr "解析 gpx 文件 {0} 时发生错误。文件将只有部分可以使用"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
+#, java-format
+msgid "File \"{0}\" does not exist"
+msgstr "文件 \"{0}\" 不存在"
+
+#. input was not properly parsed, abort
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
+#, java-format
+msgid "Parsing file \"{0}\" failed"
+msgstr "分析文件 \"{0}\" 失败"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
+msgid "Parse error: invalid document structure for GPX document."
+msgstr "分析错误：GPX 文件有无效的文件结构"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
+#, java-format
+msgid "Unknown mode {0}."
+msgstr "不明的模式 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
+msgid "Image Files"
+msgstr "照片文件"
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
+msgid "folder"
+msgstr "文件夹"
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
+msgid "Looking for image files"
+msgstr "寻找图片文件"
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
+msgid "No image files found."
+msgstr "找不到图片文件。"
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
+#, java-format
+msgid "Failed to open input stream for resource ''{0}''"
+msgstr "开启资源 \"{0}\" 的输入串流失败"
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105
+#, java-format
+msgid ""
+"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
+"zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"警告：无法开启 zip 文件 \"{0}\" 中副档名 \"{2}\" ，名称为 \"{3}\" 的文件。例"
+"外为：{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#, java-format
+msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgstr "在本地数据组合中没有 id {0} 的原型。不能推断原型的类型。"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:95
+msgid "Downloading OSM data..."
+msgstr "正在下载 OSM 数据..."
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360
+#, java-format
+msgid "Fetching node with id {0} from ''{1}''"
+msgstr "从 \"{1}\" 合并 id {0} 的节点"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361
+#, java-format
+msgid "Fetching way with id {0} from ''{1}''"
+msgstr "从 \"{1}\" 合并 id {0} 的路径"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362
+#, java-format
+msgid "Fetching relation with id {0} from ''{1}''"
+msgstr "从 \"{1}\" 合并 id {0} 的关系"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368
+#, java-format
+msgid "Server replied with response code 404 for id {0}. Skipping."
+msgstr "服务器对 id {0} 传回回应代码 404。正在跳过它。"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410
+#, java-format
+msgid "Fetching a package of nodes from ''{0}''"
+msgstr "正在从 \"{0}\" 取回节点包"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411
+#, java-format
+msgid "Fetching a package of ways from ''{0}''"
+msgstr "正在从 \"{0}\" 取回路径包"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
+#, java-format
+msgid "Fetching a package of relations from ''{0}''"
+msgstr "正在从 \"{0}\" 取回关系包"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423
+msgid ""
+"Server replied with response code 404, retrying with an individual request "
+"for each primitive."
+msgstr "服务器传回代码 404，以每个原型个别要求的方式重试。"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449
+#, java-format
+msgid "Downloading {0} object from ''{1}''"
+msgid_plural "Downloading {0} objects from ''{1}''"
+msgstr[0] "从 \"{1}\" 下载 {0} 个对象"
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22
+msgid "NMEA-0183 Files"
+msgstr "NMEA-0183 文件"
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+msgid "Coordinates imported: "
+msgstr "输入的坐标： "
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+msgid "Malformed sentences: "
+msgstr "格式不良的段落： "
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45
+msgid "Checksum errors: "
+msgstr "Checksum 错误: "
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
+msgid "Unknown sentences: "
+msgstr "不明的段落： "
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
+msgid "Zero coordinates: "
+msgstr "零坐标： "
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54
+msgid "NMEA import success"
+msgstr "NMEA 输入成功"
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57
+msgid "NMEA import failure!"
+msgstr "NMEA 输入失败!"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:86
+#, java-format
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
+msgstr "偏好设定 \"{0}\" 遗失。不能初始化 OsmApi。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:165
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr "这个版本的 JOSM 与设定的服务器。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166
+#, java-format
+msgid ""
+"It supports protocol version 0.6, while the server says it supports {0} to "
+"{1}."
+msgstr "它支持通讯协定版本 0.6，但服务器说它支持 {0} 到 {1} 版。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:170
+#, java-format
+msgid "Communications with {0} established using protocol version {1}."
+msgstr "使用 {1} 版协定建立与 {0} 的连接"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:257
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
+#, java-format
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
+msgstr "服务器返回未预期的 id 格式，取得 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
+#, java-format
+msgid ""
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
+msgstr "已修改原型 \"{0}\" 的新版本有未预期的格式。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+msgid "Creating changeset..."
+msgstr "正在建立更改组合..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
+#, java-format
+msgid "Successfully opened changeset {0}"
+msgstr "成功的开放更改组合 {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:663
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
+msgstr "预期更改组合 ID > 0 。得到 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349
+msgid "Updating changeset..."
+msgstr "正在更新更改组合..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351
+#, java-format
+msgid "Updating changeset {0}..."
+msgstr "正在更新更改组合 {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389
+msgid "Closing changeset..."
+msgstr "正在关闭更改组合..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410
+msgid "No changeset present for diff upload."
+msgstr "没有需要进行差异上传的更改组合。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+msgid "Preparing upload request..."
+msgstr "正在准备上传要求..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
+msgid "Waiting 10 seconds ... "
+msgstr "等待 10 秒... "
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450
+#, java-format
+msgid "Starting retry {0} of {1} in {2} seconds ..."
+msgstr "{2} 秒内开始重试 {1} 次中的第 {0} 次 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:458
+msgid "OK - trying again."
+msgstr "OK - 再试一次。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:539
+#, java-format
+msgid "Starting retry {0} of {1}."
+msgstr "开始重试 {1} 次中的第 {0} 次。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:635
+msgid "Current changeset is null. Cannot upload data."
+msgstr "目前的更改组合为 null。不能上传数据。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:637
+#, java-format
+msgid "ID of current changeset > 0 required. Current ID is {0}."
+msgstr "目前的更改组合 ID 必须大于 0。目前的 ID 是 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:665
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}."
+msgstr "需要开放的更改组合。却找到 id {0} 的关闭更改组合。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
+#, java-format
+msgid "(Code={0})"
+msgstr "(代码={0})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
+#, java-format
+msgid "The server replied an error with code {0}."
+msgstr "服务器返回错误，代码 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
+msgid "OSM Server Files bzip2 compressed"
+msgstr "OSM 服务器文件(bzip2 压缩)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:30
+msgid "Invalid bz2 file."
+msgstr "无效的 bz2 文件。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75
+msgid "Prolog of OsmChange document already written. Please write only once."
+msgstr "OsmChange 文件的序言已写入。请只写入一次。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
+#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
+msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgstr "OsmChange 文件的序言尚未写入。请先进行写入。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:106
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:120
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:135
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:111
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "缺少必要的属性 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr "类型 long 的必要属性 \"{0}\" 有不合格的数值。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:98
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr "类型 long (>=0) 的必要属性 \"{0}\" 有不合格的数值。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:112
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:108
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
+msgstr "类型 double 的必要属性 \"{0}\" 有不合格的数值。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:135
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr "类型 boolean 的必要属性 \"{0}\" 有不合格的数值。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:146
+msgid "<anonymous>"
+msgstr "<匿名>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:202
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:198
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"类型 OsmPrimitiveType 的必要属性 \"{0}\" 有不合格的数值。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:231
+#, java-format
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"警告：在更改组合内容的位置 ({1},{2}) 有不支持的起始元素 \"{0}\"。正在跳过。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
+msgid ""
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
+msgstr ""
+"不合格的文件结构。发现节点、路径或关系并非 \"create\"、\"modify\" 或 \"delete"
+"\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
+#, java-format
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"警告：在更改组合内容的位置 ({1},{2}) 有不支持的起始元素 \"{0}\"。正在跳过。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:307
+msgid "Parsing changeset content ..."
+msgstr "正在分析更改组合内容 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:80
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:130
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:136
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:152
+#, java-format
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgstr "属性 \"{0}\" 有不合格的数值。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:83
+#, java-format
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgstr "属性 \"{0}\" 有不合格的数字值。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:117
+#, java-format
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "属性 \"{0}\" 有不合格的布林值。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
+msgstr "缺少 XML 元素 \"{0}\" 的必要属性 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr "不支持的版本：{0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:178
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr "在输入串流中发现未定义的元素 \"{0}\"。正在中止。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:218
+msgid "Parsing list of changesets..."
+msgstr "正在分析更改组合清单..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr "无法以 OAuth 验证标头签署 HTTP 连接"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr "警告：偏好设定 \"{0}\" 有未预期的数值。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
+#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:76
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java:286
+#, java-format
+msgid "(at line {0}, column {1})"
+msgstr "(第 {0} 行，第 {1} 栏)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
+msgid "OSM Server Files"
+msgstr "OSM 服务器文件"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
+msgstr "<html>在保存时发生错误。<br>错误为：<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:104
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
+msgstr "<html>从备份文件还原时发生错误。<br>错误为：<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:119
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr "无法备份文件。例外为：{0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
+msgid "OSM Server Files gzip compressed"
+msgstr "OSM 服务器文件(以 gzip 压缩)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:238
+msgid "Parsing OSM history data ..."
+msgstr "正在分析 OSM 历史纪录数据 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "文件 \"{0}\" 不存在"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
+#, java-format
+msgid ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+msgstr ""
+"元素 \"bounds\" 缺少必要的属性。得到 minlon=\"{0}\",minlat=\"{1}\",maxlon="
+"\"{3}\",maxlat=\"{4}\", origin=\"{5}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
+msgid "Found XML element <nd> not as direct child of element <way>."
+msgstr "发现 XML 元素 <nd> 并未做为元素 <way> 的直接子项。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
+msgstr "路径 {1} 的 <nd> 缺少必要的属性 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
+#, java-format
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
+msgstr "元素 <nd> 的属性 \"ref\" 有不合格的数值。得到 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
+#, java-format
+msgid "Deleted way {0} contains nodes"
+msgstr "删除的路径 {0} 包含节点"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
+msgid "Found XML element <member> not as direct child of element <relation>."
+msgstr "发现 XML 元素 <member> 并未做为元素 <relation> 的直接子项。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
+#, java-format
+msgid "Missing attribute ''ref'' on member in relation {0}."
+msgstr "在关系 {0} 的成员缺少属性 \"ref\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
+#, java-format
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgstr "在关系 {0} 的成员属性 \"ref\"有不合格的数值。得到 {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
+#, java-format
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
+msgstr "在关系 {1} 的成员 {0} 缺少属性 \"type\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
+#, java-format
+msgid ""
+"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
+msgstr "在关系 {1} 的成员 {0} 属性 \"type\" 有不合格的数值。得到 {2}。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
+msgid "Incomplete <member> specification with ref=0"
+msgstr "不完整的 <member>> 规格，ref=0"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
+#, java-format
+msgid "Deleted relation {0} contains members"
+msgstr "删除的关系 {0} 包含成员"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+msgid "Missing key or value attribute in tag."
+msgstr "标签中缺少设定键或数值属性。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr "在输入串流中发现未定义的元素 \"{0}\"。正在跳过。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
+msgid "Illegal object with ID=0."
+msgstr "不合法的对象，id=0"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
+#, java-format
+msgid ""
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
+msgstr "在 OSM 原型 ID {0} 的属性 \"version\" 有不合格的数值。得到 {1}。"
+
+#. default version in 0.5 files for existing primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:345
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:359
+#, java-format
+msgid ""
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
+msgstr ""
+"警告：将元素 {0} 的属性 \"version\" 数值一般化为 {2}，API 版本为 \"{3}\"。得"
+"到 {1}。"
+
+#. should not happen. API version has been checked before
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
+#, java-format
+msgid "Unknown or unsupported API version. Got {0}."
+msgstr "不明或不支持的 API 版本。得到 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
+#, java-format
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
+msgstr "在 OSM 原型 ID {0} 缺少属性 \"version\" 。"
+
+#. for a new primitive we just log a warning
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
+#, java-format
+msgid ""
+"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
+"Resetting to 0."
+msgstr "在新对象 {1} 的属性 \"changeset\" 有不合格的数值。得到 {0}。重设为 0。"
+
+#. for an existing primitive this is a problem
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
+#, java-format
+msgid "Illegal value for attribute ''changeset''. Got {0}."
+msgstr "属性 \"changeset\" 有不合格的数值。得到 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
+#, java-format
+msgid "Missing required attribute ''{0}''."
+msgstr "缺少必要的属性 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
+#, java-format
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
+msgstr "属性 \"{0}\" 有不合格的 long 数值。得到 \"{1}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr "外部 ID \"{0}\" 的路径包含了缺少的外部 ID \"{1}\" 的节点。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
+#, java-format
+msgid "Deleted node {0} is part of way {1}"
+msgstr "删除的节点 {0} 是路径 {1} 的一部分"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
+#, java-format
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+"有 {1} 个节点的路径 {0} 有不完整的节点，因为在载入的数据中至少有一个节点遗失"
+"了。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
+#, java-format
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
+"external id ''{1}''."
+msgstr "外部 id \"{0}\" 的关系包含了缺少的外部 id \"{1}\" 的原型。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
+#, java-format
+msgid "Deleted member {0} is used by relation {1}"
+msgstr "删除的成员 {0} 正由关系 {1} 使用"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+msgid "Prepare OSM data..."
+msgstr "准备 OSM 数据..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+msgid "Parsing OSM data..."
+msgstr "正在分析 OSM 数据..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577
+msgid "Preparing data set..."
+msgstr "正在准备数据组合..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
+#, java-format
+msgid "Line {0} column {1}: "
+msgstr "行 {0} 栏 {1}： "
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
+msgid "Downloading from OSM Server..."
+msgstr "从 OSM 主机下载..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142
+msgid "Downloading referring ways ..."
+msgstr "正在下载参照路径 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:180
+msgid "Downloading referring relations ..."
+msgstr "正在下载参照关系 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:60
+msgid "Reading changesets..."
+msgstr "正在读取更改组合..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:66
+msgid "Downloading changesets ..."
+msgstr "正在下载更改组合 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:94
+#, java-format
+msgid "Reading changeset {0} ..."
+msgstr "正在读取更改组合 {0} ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:100
+#, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "正在下载更改组合 {0} ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:130
+#, java-format
+msgid "Downloading {0} changeset ..."
+msgid_plural "Downloading {0} changesets ..."
+msgstr[0] "正在下载 {0} 个更改组合..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:145
+#, java-format
+msgid "({0}/{1}) Downloading changeset {2} ..."
+msgstr "({0}/{1}) 正在下载更改组合 {2} ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185
+#, java-format
+msgid "Downloading content for changeset {0} ..."
+msgstr "正在下载更改组合 {0} 的内容 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68
+msgid "Downloading history..."
+msgstr "正在下载历史纪录..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25
+msgid "Contacting Server..."
+msgstr "正在连接服务器..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
+#, java-format
+msgid "Failed to open connection to API {0}."
+msgstr "开启 API {0} 连接失败"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87
+msgid ""
+"Could not connect to the OSM server. Please check your internet connection."
+msgstr "无法连接到 osm 服务器。请检查您的互联网网络连接。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
+msgid "XML tag <user> is missing."
+msgstr "缺少了 XML 标签 <user>。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
+msgstr "XML 标签 \"{1}\" 缺少了 属性 \"{0}\"。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
+msgstr "XML 标签 \"{1}\" 的属性 \"{0}\" 有不合格的数值。得到 {2}。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:126
+msgid "Reading user info ..."
+msgstr "正在读取使用者信息 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
+msgid "Starting to upload with one request per primitive ..."
+msgstr "开妒以每个原型一次要求的方式上传 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2})，剩下 {3}。正在上传节点 \"{4}\" (id: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2})，剩下 {3}。正在上传路径 \"{4}\" (id: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2})，剩下 {3}。正在上传关系 \"{4}\" (id: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:122
+msgid "Starting to upload in one request ..."
+msgstr "正在开始以一次要求上传 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
+#, java-format
+msgid "Value >0 expected for parameter ''{0}'', got {1}"
+msgstr "参数 \"{0}\" 应为大于 0 的数值，却收到 {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144
+msgid "Starting to upload in chunks..."
+msgstr "正在开始以区块上传..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:160
+#, java-format
+msgid "({0}/{1}) Uploading {2} object..."
+msgid_plural "({0}/{1}) Uploading {2} objects..."
+msgstr[0] "({0}/{1}) 正在上传 {2} 个对象..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187
+msgid "Uploading data ..."
+msgstr "正在上传数据 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:218
+msgid "Unexpected id 0 for osm primitive found"
+msgstr "发现未预期的 id 0 osm 原型"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:102
+msgid "Skip download"
+msgstr "跳过下载"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:104
+msgid "Download Plugin"
+msgstr "下载插件"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:105
+msgid "Skip Download"
+msgstr "跳过下载"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:107
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr "JOSM 第 {0} 版需要插件 {1}。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:112
+msgid "Download skipped"
+msgstr "下载跳过的"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
+#, java-format
+msgid ""
+"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
+"Skipping download."
+msgstr "警告：不能下载插件 \"{0}\"。它的下载连接不明。正跳过下载。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:139
+#, java-format
+msgid ""
+"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
+"valid URL. Skipping download."
+msgstr ""
+"警告：不能下载插件 \"{0}\"。它的下载连接 \"{1}\" 不是有效的 URL。正跳过下载。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:167
+#, java-format
+msgid "Failed to create plugin directory ''{0}''"
+msgstr "无法建立插件目录 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:175
+#, java-format
+msgid "Downloading Plugin {0}..."
+msgstr "正在下载插件 {0}..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
+#: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:30
+#, java-format
+msgid "An error occurred in plugin {0}"
+msgstr "插件 {0} 发生错误"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
+msgid "The following plugin is no longer necessary and has been deactivated:"
+msgid_plural ""
+"The following plugins are no longer necessary and have been deactivated:"
+msgstr[0] "下列插件已不再需要且切换为不使用："
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#, java-format
+msgid ""
+"<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
+"longer developed and very likely will produce errors.<br>It should be "
+"disabled.<br>Delete from preferences?</html>"
+msgstr ""
+"<html>已要求载入插件 \"{0}\"。<br>这个插件已不再开发并且很有可能产生问题。"
+"<br>它应该被停用。<br>是否从偏好设定中删除?</html>"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
+msgid ""
+"You updated your JOSM software.<br>To prevent problems the plugins should be "
+"updated as well.<br><br>Update plugins now?"
+msgstr ""
+"您已经更新了 JOSM 软体。<br>为了避免问题也应该更新插件。<br><br>是否立即更新?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "上次的插件更新已是 {0} 天前。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
+msgid "Click to update the activated plugins"
+msgstr "点击以更新使用中的插件"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
+msgid "Skip update"
+msgstr "跳过更新"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+msgid "Click to skip updating the activated plugins"
+msgstr "点击以跳过更新使用中的插件"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:215
+msgid ""
+"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
+"disabled."
+msgstr "跳过在 JOSM 升级后的插件更新。启动时自动更新已停用。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
+msgid ""
+"Skipping plugin update after elapsed update interval. Automatic update at "
+"startup is disabled."
+msgstr "跳过在经过更新时间间隔后的插件更新。启动时自动更新已停用。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
+msgid ""
+"Running plugin update after JOSM upgrade. Automatic update at startup is "
+"enabled."
+msgstr "执行在 JOSM 升级后的插件更新。启动时自动更新已启用。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:226
+msgid ""
+"Running plugin update after elapsed update interval. Automatic update at "
+"startup is disabled."
+msgstr "执行在经过更新时间间隔后的插件更新。启动时自动更新已启用。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232
+#, java-format
+msgid ""
+"Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
+msgstr "偏好设定 \"{1}\" 有未预期的数值 \"{0}\"。推测数值应为 \"ask\"。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#, java-format
+msgid ""
+"Plugin {0} requires a plugin which was not found. The missing plugin is:"
+msgid_plural ""
+"Plugin {0} requires {1} plugins which were not found. The missing plugins "
+"are:"
+msgstr[0] "找不到插件 {0} 需要的 {1} 插件。缺少的插件为："
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
+#, java-format
+msgid ""
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
+"<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+"<html>插件 {0} 需要 JOSM 版本 {1}。目前的 JOSM 版本为 {2}。<br>您必须更新 "
+"JOSM 才能使用这个插件。</html>"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:378
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "无法载入插件 {0}。是否从偏好设定中删除?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:382
+#, java-format
+msgid "loading plugin ''{0}'' (version {1})"
+msgstr "正在载入插件 \"{0}\" (版本 {1})"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:389
+#, java-format
+msgid ""
+"<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
+"not found.<br>Delete from preferences?"
+msgstr ""
+"<html>无法载入插件 {0} ，因为插件<br>main 类别 \"{1}\" 找不到。<br>是否从偏好"
+"设定删除?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:411
+msgid "Loading plugins ..."
+msgstr "正在载入插件 ..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:412
+msgid "Checking plugin preconditions..."
+msgstr "正在检查插件先决条件..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:439
+#, java-format
+msgid "Loading plugin ''{0}''..."
+msgstr "正在载入插件 \"{0}\" ..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:520
+msgid "JOSM could not find information about the following plugin:"
+msgid_plural "JOSM could not find information about the following plugins:"
+msgstr[0] "JOSM 找不到下列插件的相关信息："
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:528
+msgid "The plugin is not going to be loaded."
+msgid_plural "The plugins are not going to be loaded."
+msgstr[0] "这个插件将不会被载入。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:554
+msgid "Determine plugins to load..."
+msgstr "决定要载入的插件..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:560
+msgid "Removing deprecated plugins..."
+msgstr "正在删除废弃的插件..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:562
+msgid "Removing unmaintained plugins..."
+msgstr "正在删除停止维护的插件..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:586
+msgid "Updating the following plugin has failed:"
+msgid_plural "Updating the following plugins has failed:"
+msgstr[0] "更新下列插件失败："
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:597
+msgid ""
+"Please open the Preference Dialog after JOSM has started and try to update "
+"it manually."
+msgid_plural ""
+"Please open the Preference Dialog after JOSM has started and try to update "
+"them manually."
+msgstr[0] "请在 JOSM 启动后开启偏好设定对话框并尝试手动更新。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:605
+msgid "Plugin update failed"
+msgstr "插件更新失败"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
+msgid "Warning: failed to download plugin information list"
+msgstr "警告：无法下载插件数据清单"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:707
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:805
+msgid "Disable plugin"
+msgstr "停用插件"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:709
+#, java-format
+msgid "Click to delete the plugin ''{0}''"
+msgstr "点击以删除插件 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:713
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:811
+msgid "Keep plugin"
+msgstr "保留插件"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:715
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:813
+#, java-format
+msgid "Click to keep the plugin ''{0}''"
+msgstr "点击以保留插件 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
+#, java-format
+msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgstr "警告：无法删除过时的插件 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:790
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:796
+#, java-format
+msgid ""
+"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
+"installation. JOSM is still going to load the old plugin version."
+msgstr ""
+"警告：无法安装已下载的插件 \"{0}\"。正在跳过安装。JOSM 仍然会载入旧的插件版"
+"本。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
+#, java-format
+msgid ""
+"Warning: failed to install plugin ''{0}'' from temporary download file "
+"''{1}''. Renaming failed."
+msgstr "警告：无法从缓存下载文件 \"{1}\" 安装插件 \"{0}\"。仍然失败。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:807
+#, java-format
+msgid "Click to disable the plugin ''{0}''"
+msgstr "点击以停用插件 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:820
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr "发生未预期的例外，可能来自 \"{0}\" 插件。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:823
+#, java-format
+msgid "According to the information within the plugin, the author is {0}."
+msgstr "根据此插件的信息，作者是 {0}。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:826
+msgid ""
+"Try updating to the newest version of this plugin before reporting a bug."
+msgstr "在回复程序错误前请先尝试将插件升级到最新版本。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:828
+msgid "Should the plugin be disabled?"
+msgstr "是否停用此插件?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
+msgid ""
+"The plugin has been removed from the configuration. Please restart JOSM to "
+"unload the plugin."
+msgstr "该插件已从组态中删除。请重新启动 JOSM 以卸载插件。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:942
+msgid "Plugin information"
+msgstr "插件信息"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:947
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:235
+msgid "no description available"
+msgstr "没有描述可用"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:979
+msgid ""
+"Do not ask again and remember my decision (go to Preferences->Plugins to "
+"change it later)"
+msgstr "不要再询问并记住我的决定 (稍后可至 偏好设定->插件 改变它)"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:86
+#, java-format
+msgid "The plugin file ''{0}'' does not include a Manifest."
+msgstr "插件文件 \"{0}\" 没有包含 Manifest。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:237
+msgid "More info..."
+msgstr "更多信息..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:42
+#: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:44
+#, java-format
+msgid "Failed to create plugin information from manifest for plugin ''{0}''"
+msgstr "无法从插件 \"{0}\" 的 manifest 建立插件信息"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:41
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:46
+msgid "Reading local plugin information.."
+msgstr "正在读取本地插件信息.."
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:84
+msgid "Processing plugin site cache files..."
+msgstr "正在处理插件网站缓存文件..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:88
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:137
+#, java-format
+msgid "Processing file ''{0}''"
+msgstr "正在处理文件 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:92
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:147
+#, java-format
+msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgstr "警告：无法扫描文件 \"{0}\" 的插件信息。正在跳过。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:109
+msgid "Processing plugin site cache icon files..."
+msgstr "正在处理插件网站缓存图示文件..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:133
+msgid "Processing plugin files..."
+msgstr "正在处理插件文件..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:66
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:77
+msgid "Download plugin list..."
+msgstr "下载插件清单..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:158
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:211
+#, java-format
+msgid "Downloading plugin list from ''{0}''"
+msgstr "正在从 \"{0}\" 下载插件清单"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:269
+#, java-format
+msgid ""
+"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
+"from plugin site ''{1}''."
+msgstr "警告：无法建立插件目录 \"{0}\"。不能从插件网站 \"{1}\" 缓存插件清单。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:273
+#, java-format
+msgid "Writing plugin list to local cache ''{0}''"
+msgstr "正在将插件清单写入本地缓存 \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:314
+#, java-format
+msgid "Parsing plugin list from site ''{0}''"
+msgstr "正在分析网站 \"{0}\" 的插件清单"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:319
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:322
+#, java-format
+msgid ""
+"Failed to parse plugin list document from site ''{0}''. Skipping site. "
+"Exception was: {1}"
+msgstr "无法解析网站 \"{0}\" 的插件清单文件。正在跳过网站。例外为：{1}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:350
+#, java-format
+msgid "Processing plugin list from site ''{0}''"
+msgstr "正在处理网站 \"{0}\" 的插件清单"
+
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301
+msgid "This is after the end of the recording"
+msgstr "这已在记录的结尾之后"
+
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343
+msgid "unspecified reason"
+msgstr "未指定的原因"
+
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:348
+msgid "Error playing sound"
+msgstr "播放音效时发生错误"
+
+#. Then ask for submitting a bug report, for exceptions thrown from a plugin too
+#.
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+msgid "Do nothing"
+msgstr "不做任何事"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+msgid "Report Bug"
+msgstr "回复程序错误"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"发生未预期的例外。<br>这通常是程序码的错误。如果您使用的是最新版的<br>JOSM，"
+"请考虑不吝回复错误。"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+msgid "Unexpected Exception"
+msgstr "未预期的例外"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"您遇到了 JOSM 的错误。在您回复错误之前请确定您已更新到在这里最新版的 JOSM："
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"您也应该更新您的插件。如果这些都没有帮助，请在以下连结的错误追踪程序回复错"
+"误："
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"下面提供了错误信息已为您填好。请加上关于如何重现这个错误的信息，并尽可能详细"
+"一些。"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr "另外，如果这些都不行您也可以在这个 URL 自行填写信息："
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(该文字已复制到您的剪贴簿中。)"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+msgid "You have encountered a bug in JOSM"
+msgstr "您遇到了 JOSM 的程序错误"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:42
+#, java-format
+msgid ""
+"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
+"the server URL in your preferences and your internet connection.</html>"
+msgstr ""
+"<html>无法初始化与 OSM 服务器 {0} 的连接。<br>请检查您偏好设定中服务器 URL 和"
+"互联网网络连接。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
+#, java-format
+msgid ""
+"<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using "
+"OAuth to authenticate but currently there is no<br>OAuth Access Token "
+"configured.<br>Please open the Preferences Dialog and generate or enter an "
+"Access Token.</html>"
+msgstr ""
+"<html>无法验证 OSM 服务器 \"{0}\"。<br>您正使用 OAuth 验证但目前尚未设定"
+"<br>OAuth 存取记号。<br>请开启偏好设定对话框并产生或输入存取记号。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:78
+#, java-format
+msgid ""
+"<html><strong>Failed</strong> to delete <strong>relation {0}</strong>. It is "
+"still referred to by relation {1}.<br>Please load relation {1}, remove the "
+"reference to relation {0}, and upload again.</html>"
+msgstr ""
+"<html><strong>无法</strong>删除<strong>关系 {0}</strong>。它仍然被关系 {1} 参"
+"照。<br>请载入关系 {1}，删除对关系 {0} 的参照，并再上传一次。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:105
+#, java-format
+msgid ""
+"<html>Uploading to the server <strong>failed</strong> because your "
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>上传至服务器<strong>失败</strong>，因为您目前的<br>数据组合违反了先决条"
+"件。<br>错误的信息为：<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+"html>以用户名 \"{0}\" 验证 OSM 服务器失败。<br>请检查在 JOSM 偏好设定中的用户"
+"名和密码。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+"<html>以 OAuth 存取记号 \"{0}\" 验证 OSM 服务器失败。<br>请执行偏好设定对话框"
+"并取回另一个 OAuth 存取记号。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:133
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+"<html>以 OAuth 存取记号 \"{0}\" 验证 OSM 服务器失败。<br>这个记号未获授权存取"
+"受保护的资源<br>\"{1}\"。<br>请执行偏好设定对话框并取回另一个 OAuth 存取记"
+"号。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+#, java-format
+msgid ""
+"<html>Communication with the OSM server ''{0}'' timed out. Please retry "
+"later.</html>"
+msgstr "<html>与 OSM 服务器 \"{0}\" 连接超时。请稍后再试。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+msgid "no error message available"
+msgstr "没有错误信息"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:174
+#, java-format
+msgid ""
+"<html>Communication with the OSM server ''{0}''failed. The server "
+"replied<br>the following error code and the following error message:"
+"<br><strong>Error code:<strong> {1}<br><strong>Error message (untranslated)</"
+"strong>: {2}</html>"
+msgstr ""
+"<html>与 OSM 服务器 \"{0}\" 连接失败。服务器返回<br>下列错误代码与信息："
+"<br><strong>错误代码：<strong> {1}<br><strong>错误信息 (未翻译)：</strong> "
+"{2}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:212
+#, java-format
+msgid ""
+"<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
+"already been closed.</html>"
+msgstr ""
+"<html>更改组合 <strong>{0}</strong> 的关闭失败 <br>因为它已经被关闭了。</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
+#, java-format
+msgid ""
+"<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
+"already been closed on {1}.</html>"
+msgstr ""
+"<html>更改组合 <strong>{0}</strong> 的关闭失败 <br>因为它已经在 {1} 被关闭"
+"了。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:227
+#, java-format
+msgid ""
+"<html>The server reported that it has detected a conflict.<br>Error message "
+"(untranslated):<br>{0}</html>"
+msgstr "<html>服务器回复它检测到冲突。<br>错误信息: <br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:233
+msgid "<html>The server reported that it has detected a conflict.</html>"
+msgstr "<html>服务器回复它检测到冲突。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid ""
+"<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
+"already been closed on {1}.</html>"
+msgstr ""
+"<html>无法上传更改组合 <strong>{0}</strong><br>因为它已经被关闭于 {1}。</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
+"security reasons. This is most likely because you are running<br>in an "
+"applet and because you did not load your applet from ''{1}''.</html>"
+msgstr ""
+"<html>基于安全性的理由无法连接到远程服务器<br>\"{0}\"。<br>这大部分是因为您"
+"以 applet 执行<br>以及您没有从 \"{1}\" 载入 applet。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:304
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
+"check your internet connection.</html>"
+msgstr ""
+"<html>无法连接到远程服务器<br>\"{0}\"。<br>请检查您的互联网网络连接。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:321
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+"<html>无法由此上传或下载数据：<br>\"{0}\"<br>因为传输数据有问题。<br>详细数"
+"据 (未翻译)： {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:336
+#, java-format
+msgid ""
+"<html>Failed to download data. Its format is either unsupported, ill-formed, "
+"and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
+msgstr ""
+"<html>无法下载数据。它的格式可能不支持、格式有问题和/或不一致。<br><br>详细数"
+"据 (未翻译)： {0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:352
+#, java-format
+msgid ""
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+"<html>OSM 服务器<br> \"{0}\" <br>回复了内部的服务器错误。<br>这很可能是暂时性"
+"的错误。请稍后再试一次。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr "OSM 服务器 \"{0}\" 回复了错误的请求。<br>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:371
+msgid ""
+"The area you tried to download is too big or your request was too large."
+"<br>Either request a smaller area or use an export file provided by the OSM "
+"community."
+msgstr ""
+"您尝试下载的区域太大或是您的要求太大。<br>可以要求小一点的区域或是使用 OSM 社"
+"群提供的输出文件。"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:374
+#, java-format
+msgid "<br>Error message(untranslated): {0}"
+msgstr "<br>错误信息: {0}"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:388
+#, java-format
+msgid ""
+"The OSM server ''{0}'' does not know about an object<br>you tried to read, "
+"update, or delete. Either the respective object<br>does not exist on the "
+"server or you are using an invalid URL to access<br>it. Please carefully "
+"check the server''s address ''{0}'' for typos."
+msgstr ""
+"OSM 服务器 \"{0}\" 不知道您尝试读取、<br>更新或删除的对象。可能是各个对象不在"
+"<br>服务器上或是您使用无效的 URL 存取<br>它。请小心检查服务器位址 \"{0}\" 以"
+"免打错字。"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:415
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
+"name ''{1}'' could not be resolved. <br>Please check the API URL in your "
+"preferences and your internet connection.</html>"
+msgstr ""
+"<html>无法连接至远程服务器<br> \"{0}\"。<br>无法解析主机名称 \"{1}\"。<br>请"
+"检查您偏好设定中的 API URL 与互联网网络连接。</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:487
+#, java-format
+msgid ""
+"<html>The server reports that an object is deleted.<br><strong>Uploading "
+"failed</strong> if you tried to update or delete this object.<br> "
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+"<html>服务器回复有对象已被删除。<br>如果您尝试更新或删除这个对象则会<strong>"
+"上传失败</strong>。<br>如果您尝试下载这个对象则会<strong>下载失败</strong>。"
+"<br><br>错误的信息为：<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#, java-format
+msgid "Unable to find translation for the locale {0}. Reverting to {1}."
+msgstr "找不到地区设定 {0} 的翻译档。回复为 {1}。"
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "警告：无法处理 zip 文件 \"{0}\"。例外为：{1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228
+#, java-format
+msgid ""
+"Warning: failed to access directory ''{0}'' for security reasons. Exception "
+"was: {1}"
+msgstr "警告：基于安全性理由无法存取目录 \"{0}\"。例外为：{1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248
+#, java-format
+msgid ""
+"Fatal: failed to locate image ''{0}''. This is a serious configuration "
+"problem. JOSM will stop working."
+msgstr ""
+"严重的错误：无法定位图片 \"{0}\"。这是严重的组态问题。JOSM 会停止运作。"
+
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#, java-format
+msgid ""
+"Warning: failed to derive wiki language prefix from JOSM locale code "
+"''{0}''. Using default code ''en''."
+msgstr ""
+"警告：无法从 JOSM 地区代码 \"{0}\" 取得 wiki 语言前缀。使用预设的代码 \"en"
+"\"。"
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
+msgstr "无法开启 URL。目前尚未设定平台。请先设定平台。"
+
+#. This list if far from complete!
+#. items with automatic shortcuts will not be added to the menu bar at all
+#. not really system, but to avoid odd results
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:49
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:50
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:51
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:52
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:53
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:54
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:55
+msgid "unused"
+msgstr "未使用的"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#, java-format
+msgid ""
+"Setting the keyboard shortcut ''{0}'' for the action ''{1}'' ({2}) failed\n"
+"because the shortcut is already taken by the action ''{3}'' ({4}).\n"
+"\n"
+msgstr ""
+"将键盘快捷键 \"{0}\" 设定为动作 \"{1}\" ({2})失败\n"
+"因为该快捷键已用于动作 \"{3}\"({4})。\n"
+"\n"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+msgid ""
+"This action will have no shortcut.\n"
+"\n"
+msgstr ""
+"这个动作没有快捷键。\n"
+"\n"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#, java-format
+msgid ""
+"Using the shortcut ''{0}'' instead.\n"
+"\n"
+msgstr ""
+"使用快捷键 \"{0}\" 代替。\n"
+"\n"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+msgid "(Hint: You can edit the shortcuts in the preferences.)"
+msgstr "(提示：您可以在偏好设定中编辑快捷键。)"
+
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:75
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:87
+#, java-format
+msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
+msgstr "警告：无法从 \"{0}\" 读取 MOTD。例外为：{1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:80
+#, java-format
+msgid ""
+"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception "
+"was: {1}"
+msgstr "警告：基于安全性理由无法从 \"{0}\" 读取 MOTD。例外为：{1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
+#, java-format
+msgid ""
+"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
+"geometry from preferences."
+msgstr ""
+"偏好设定的设定键 \"{0}\" 不包含 \"{1}\"。不能从偏好设定中回复视窗位置大小。"
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:113
+#, java-format
+msgid ""
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
+"{2}. Cannot restore window geometry from preferences."
+msgstr ""
+"偏好设定的设定键 \"{0}\" 没有提供 \"{1}\" 的整数值。得到 \"{2}\"。不能从偏好"
+"设定中恢复窗口位置大小。"
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:115
+#, java-format
+msgid ""
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"{2}. Cannot restore window geometry from preferences."
+msgstr ""
+"无法解析偏好设定的设定键 \"{0}\" 的栏位 \"{1}\"。例外为：{2}。不能从偏好设定"
+"中恢复窗口位置大小。"
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:122
+#, java-format
+msgid ""
+"Preference with key ''{0}'' does not exist. Cannot restore window geometry "
+"from preferences."
+msgstr "偏好设定的设定键 \"{0}\" 不存在。不能从偏好设定中恢复窗口位置大小。"
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
+msgid "Create grid of ways"
+msgstr "建立路径的格线"
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
+msgid ""
+"Forms a grid of ways in base to two existing that have various nodes and one "
+"in common"
+msgstr "以两条已存在，有一个共同节点的多节点路径组成格状路径"
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53
+msgid "Select two ways with a node in common"
+msgstr "选择两条有共同节点的路径"
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63
+msgid "Select two ways with alone a node in common"
+msgstr "选择两条只有一个共同节点的路径"
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104
+msgid "Create a grid of ways"
+msgstr "建立路径的格线"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59
+msgid "Private (only shared as anonymous, unordered points)"
+msgstr "私人 (只以匿名分享，无顺序的点)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60
+msgid "Public (shown in trace list and as anonymous, unordered points)"
+msgstr "公开 (以匿名显示于轨迹清单，无顺序的点)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61
+msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
+msgstr "可追踪 (只以匿名分享，有时间戳记顺序的点)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62
+msgid ""
+"Identifiable (shown in trace list and as identifiable, ordered points with "
+"timestamps)"
+msgstr "可辨识 (以可辨识的方式显示于轨迹清单，有时间戳记顺序的点)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:107
+msgid "Upload Trace"
+msgstr "上传轨迹"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+msgid "Upload Traces"
+msgstr "上传轨迹"
+
+#. item "Ways/Path" combo "MTB Scale"
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
+#: build/trans_presets.java:490
+msgid "Visibility"
+msgstr "可见状态"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
+msgid "Defines the visibility of your trace for other OSM users."
+msgstr "定义您的轨迹对其他 OSM 使用者的可见性。"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141
+msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141
+msgid "(What does that mean?)"
+msgstr "(那代表什么?)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:144
+msgid "Please enter Description about your trace."
+msgstr "请输入您的轨迹的相关描述。"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146
+msgid "Tags (comma delimited)"
+msgstr "标签 (以逗号分隔)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:147
+msgid "Please enter tags about your trace."
+msgstr "请输入您的轨迹的标签。"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:194
+#, java-format
+msgid "Selected track: {0}"
+msgstr "选取的轨迹：{0}"
+
+#. Set progress dialog to indeterminate while connecting
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:217
+msgid "Connecting..."
+msgstr "正在连接..."
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:240
+msgid "Upload cancelled"
+msgstr "上传已取消"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:250
+msgid "Error while uploading"
+msgstr "上传时发生错误"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
+msgid "GPX upload was successful"
+msgstr "GPX 上传成功"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:305
+msgid "Upload failed. Server returned the following message: "
+msgstr "上传失败。服务器传回下列信息： "
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:347
+#, java-format
+msgid "Uploading GPX track: {0}% ({1} of {2})"
+msgstr "正在上传 GPX 轨迹：{0}% ({1} / {2})"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:379
+msgid "No description provided. Please provide some description."
+msgstr "没有提供描述。请提供一些描述。"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:382
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:404
+msgid "No GPX layer selected. Cannot upload a trace."
+msgstr "没有选取 GPX 图层。不能上传轨迹。"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:385
+msgid "No username provided."
+msgstr "没有提供使用者名称。"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:388
+msgid "No password provided."
+msgstr "没有提供密码。"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:420
+msgid "Uploading GPX Track"
+msgstr "正在上传 GPX 轨迹"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36
+msgid "Uploads traces to openstreetmap.org"
+msgstr "上传轨迹至 openstreetmap.org"
+
+#. item "Man-Made/Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
+#: build/trans_presets.java:2330
+msgid "Address Interpolation"
+msgstr "地址编排规则"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+msgid "Define Address Interpolation"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+msgid "Odd"
+msgstr "奇数"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+msgid "Even"
+msgstr "偶数"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+msgid "Alphabetic"
+msgstr "字母"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+msgid "Numeric"
+msgstr "数字"
+
+#. NOTE: The following 2 arrays must match in number of elements and position
+#. Tag values for map
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
+msgid "Actual"
+msgstr "实际"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
+msgid "Estimate"
+msgstr "预计"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
+msgid "Potential"
+msgstr "潜在"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190
+#, java-format
+msgid "Relation: {0}"
+msgstr "关系：{0}"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:202
+msgid "Associate with street using:"
+msgstr "与街道关联的方式："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:213
+msgid "Numbering Scheme:"
+msgstr "编号规则："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216
+msgid "Increment:"
+msgstr "递增："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220
+msgid "Starting #:"
+msgstr "开始 #："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:221
+msgid "Ending #:"
+msgstr "结尾 #："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:226
+msgid "Accuracy:"
+msgstr "准确度："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238
+msgid "Convert way to individual house numbers."
+msgstr "将路径转换为个别的房屋号码。"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr "将关联 {0} 个额外的房屋号码节点"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:454
+msgid "City:"
+msgstr "城市："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:455
+msgid "State:"
+msgstr "状态："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:456
+msgid "Post Code:"
+msgstr "邮递区号："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:457
+msgid "Country:"
+msgstr "国家："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:458
+msgid "Full Address:"
+msgstr "完整地址："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:493
+msgid "Optional Information:"
+msgstr "选择性的信息："
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:678
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:691
+msgid "Please select address interpolation way for this street"
+msgstr ""
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1078
+msgid "Expected odd numbers for addresses"
+msgstr "预测的奇数地址"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1083
+msgid "Expected even numbers for addresses"
+msgstr "预测的偶数地址"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093
+msgid "Expected valid number for address increment"
+msgstr "预测地址增加的数字"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
+msgid "Country code must be 2 letters"
+msgstr "国码只能使用 2 个字节"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1278
+msgid "Please enter valid number for starting and ending address"
+msgstr "请输入开始与结尾地址的有效编号"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296
+msgid "Alphabetic address must end with a letter"
+msgstr "字母住址必须以字母结尾"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgstr "开始与结尾的编号必须属于同一个字母地址"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
+msgid "Starting address letter must be less than ending address letter"
+msgstr "开始住址的字母必须少于结尾住址的字母"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1333
+msgid "Please enter valid number for starting address"
+msgstr "请输入开始住址的有效数字"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1336
+msgid "Please enter valid number for ending address"
+msgstr "请输入结尾住址的有效数字"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343
+msgid "Starting address number must be less than ending address number"
+msgstr "开始住址的数字必须少于结尾住址的数字"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:34
+msgid "Align Way Segments"
+msgstr "对齐路径区段"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:35
+msgid ""
+"Makes a pair of selected way segments parallel by rotating one of them "
+"around a chosen pivot."
+msgstr ""
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:38
+msgid "Align Ways"
+msgstr "对齐路径"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:67
+msgid ""
+"You cannot align connected segments.\n"
+"Please select two segments that don''t share any nodes."
+msgstr ""
+"您不能对齐相互连接的区段。\n"
+"请选取两个没有共用任何节点的区段。"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:69
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:80
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:73
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:111
+msgid "AlignWayS message"
+msgstr "AlignWayS 信息"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:78
+msgid ""
+"Aligning would result nodes outside the world.\n"
+"Your action is being reverted."
+msgstr ""
+"对齐会造成节点掉出世界之外。\n"
+"您的动作被还原了。"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:163
+msgid "I''m ready!"
+msgstr "准备就绪!"
+
+#. 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:167
+msgid "AlignWays Tips"
+msgstr "AlignWays 密诀"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysPlugin.java:32
+msgid "Align Ways mode"
+msgstr "对齐路径模式"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysRotateCommand.java:169
+msgid "Align way segment"
+msgstr "对齐路径区段"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:38
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegment.java:41
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "参数 \"{0}\" 不能为空"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:71
+msgid ""
+"Segment to be aligned cannot be the same with the reference segment.\n"
+"Please choose a different segment to be aligned."
+msgstr ""
+"要对齐的区段不能和参考用区段是同一个。\n"
+"请选择不同的区段来对齐。"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysSegmentMgr.java:109
+msgid ""
+"Reference segment cannot be the same with the segment to be aligned.\n"
+"Please choose a different reference segment."
+msgstr ""
+"参考用区段不能和要对齐的区段是同一个。\n"
+"请选择不同的参考区段。"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:54
+msgid ""
+"<html>\n"
+"<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
+"italic;\">\n"
+"<span style=\"font-size: large;\">Welcome to the</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> Plugin<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...or it rather should be called <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> Plugin...</"
+"span>\n"
+"</div>\n"
+"</html>"
+msgstr ""
+"<html>\n"
+"<div style=\"font-family: 'sans-serif'; font-weight: bold; font-style: "
+"italic;\">\n"
+"<span style=\"font-size: large;\">欢迎使用</span><br>\n"
+"<span style=\"font-size: xx-large;\">AlignWay<span style=\"color: rgb(204, "
+"85, 0);\">S</span> 插件<br>\n"
+"</span><span style=\"font-size: medium;\"><br>\n"
+"...或者它应该被称为 <br>\n"
+"<span style=\"font-size: large;\">AlignWayS(egments)</span> 插件...</span>\n"
+"</div>\n"
+"</html>"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:79
+msgid ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays will\n"
+"help you to align two way segments. This can be handy when for instance\n"
+"you sketch the outlines of a building and want its side to be parallel\n"
+"with a street or road.<br>\n"
+"<br>\n"
+"Some tips may help before you start:\n"
+"</p>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays会帮助您对"
+"齐两个\n"
+"路径区段。举例来说，当您在描绘建筑物的\n"
+"轮廓而且希望它的边缘和街道或道路平行\n"
+"时会很有帮助。<br>\n"
+"<br>\n"
+"在您开始前有些密诀可能有所帮助：\n"
+"</p>\n"
+"</html>\n"
+"\n"
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:86
+msgid ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> You can do this by <b><i><span style="
+"\"color:green\">Ctrl-click</span></i></b>ing\n"
+"on a segment. The other, to be aligned segment will become parallel to\n"
+"this one. </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<div style=\"font-family: sans-serif;\">\n"
+"<ul>\n"
+"<li><b>Select a reference segment.</b> 要这么做您可以按<b><i><span style="
+"\"color:green\">Ctrl-点击</span></i></b>\n"
+"一个区段。而另一个，要被对齐的区段就会变得跟这个区段\n"
+"平行。</li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:90
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Select the to be aligned segment.</b> You can do this by simply "
+"<b><i><span style=\"color:green\">click</span></i></b>ing on a different "
+"segment. \n"
+"The rotation pivot will be highlighted by default in the centre of the "
+"segment.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:94
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li>Optionally <b>change the rotation pivot point</b>. In order to get "
+"parallel with the reference segment, the to be aligned segment will rotate "
+"around this point. You can choose the two extremities or the centre of the "
+"segment by <b><i><span style=\"color:green\">click</span></i></b>ing "
+"nearby. \n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+
+#. NOI18N
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:98
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>Align the segments.</b> Press <b><i><span style=\"color:green"
+"\">Shift-A</span></i></b>. Alternatively you''ll find the command in the "
+"<b>Tools</b>\n"
+" menu or may want to place the action on the <b>toolbar</b>.\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<ul>\n"
+"  <li><b>对齐区段。</b> 请按 <b><i><span style=\"color:green\">Shift-A</"
+"span></i></b>。另外您可以在<b>工具</b>菜单找到这个指令\n"
+"，也可以把这个动作放置到<b>工具列</b>上。\n"
+"  </li>\n"
+"</ul>\n"
+"</div>\n"
+"</html>\n"
+"\n"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:101
+msgid ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> There is an easy way to start over your selections if you "
+"want: <b><i><span style=\"color:green\">Alt-Click</span></i></b> somewhere "
+"on the map.\n"
+"</div>\n"
+"</html>\n"
+"\n"
+msgstr ""
+"<html>\n"
+"<div style=\"font-family:sans-serif\">\n"
+"<b>Last hint:</b> 如果您想要重新开始选择，有一个很简单的方法： <b><i><span "
+"style=\"color:green\">Alt-点击</span></i></b> 地图的某个地方。\n"
+"</div>\n"
+"</html>\n"
+"\n"
+
+#: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysTipsPanel.java:135
+msgid "Don''t show this again"
+msgstr "不要再次显示这个信息"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
+msgid "Building address"
+msgstr "建筑地址"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+msgid "House number:"
+msgstr "门牌号码："
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
+msgid "Street Name:"
+msgstr "街道名称："
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+msgid "Increment"
+msgstr "递增"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
+msgid "Decrement"
+msgstr "递减"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
+msgid "Numbers:"
+msgstr "号码："
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+msgid "Big buildings mode"
+msgstr "大型建筑模式"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
+msgid "Rotate crosshair"
+msgstr ""
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
+msgid "Advanced settings"
+msgstr "高级设置"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
+msgid "Building tag:"
+msgstr "建筑物标签:"
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
+msgid "Cannot place building outside of the world."
+msgstr "不能将建筑物放到世界外头。"
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:257
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
+msgid "Create building"
+msgstr "建立建筑物"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+msgid "Set buildings size"
+msgstr "设定建筑物大小"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+msgid "Use Address dialog"
+msgstr "使用地址对话框"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
+msgid "Auto-select building"
+msgstr ""
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+msgid "Buildings width:"
+msgstr "建筑物宽度："
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
+msgid "Length step:"
+msgstr ""
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
+msgid "Advanced..."
+msgstr "高级..."
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
+msgid "Draw buildings"
+msgstr "绘制建筑物"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
+msgid "Point on the corner of the building to start drawing"
+msgstr ""
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
+msgid "Point on opposite end of the building"
+msgstr ""
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
+msgid "Set width of the building"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
+msgid "on polygon"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
+msgid "Add address"
+msgstr "添加地址"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96
+msgid "Helping tool for tag address"
+msgstr "帮助标记地址的工具"
+
+#. group "Man-Made"
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2193
+msgid "Buildings"
+msgstr "建筑物"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
+msgid "Next no"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
+msgid "Street"
+msgstr "街"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
+msgid "Enter addresses"
+msgstr "输入地址"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
+msgid "Grab buildings"
+msgstr "抓取建筑"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
+msgid "Extract building on click (vector images only)"
+msgstr "点击解开建筑 (只适用矢量图片)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
+msgid ""
+"This feature requires (at least) one special cadastre\n"
+"Buildings layer and an OSM data layer."
+msgstr ""
+"这个功能需要(至少)一个特殊的 cadastre\n"
+"建筑图层和 OSM 数据图层。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
+#, java-format
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
+msgstr ""
+"在缓存中找到位置 \"{0}\"。\n"
+"是否先载入缓存?\n"
+"(否 = 新增缓存)"
+
+#. this below is a temporary workaround to fix the "always on top" issue
+#. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
+#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:439
+msgid "Select Feuille"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:157
+msgid ""
+"Error loading file.\n"
+"Probably an old version of the cache file."
+msgstr ""
+"载入文件时发生错误。\n"
+"可能是旧版的缓存文件。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20
+#, java-format
+msgid "Lambert Zone {0} cache file (.{0})"
+msgstr "兰勃特区 {0} 缓存文件 (.{0})"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27
+#, java-format
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgstr "兰勃特 CC9 区 {0} 缓存文件 (.CC{0})"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21
+msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
+msgid "Reunion RGR92 cache file (.UTM4)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:51
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:171
+msgid "CadastreGrabber: Illegal url."
+msgstr "CadastreGrabber: 不合法的 url。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:83
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+"不能开启新的客户端 session。\n"
+"服务器正在维护或是暂时过载。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:91
+#, java-format
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
+msgstr ""
+"城/镇 {0} 找不到或无法使用\n"
+"或是动作已取消"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:408
+msgid "Choose from..."
+msgstr "选择自..."
+
+#. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
+#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:419
+msgid "Select commune"
+msgstr "选择社区"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:179
+msgid "Cadastre"
+msgstr "地籍管理"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:188
+msgid "Auto sourcing"
+msgstr "自动来源"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254
+msgid ""
+"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+"which is currently allocated for full-screen switch by default\n"
+"Would you like to restore F11 for grab action ?"
+msgstr ""
+"插件 cadastre-fr 一般使用功能键 F11 为快捷键\n"
+"但它目前是预设分配给全屏切换使用\n"
+"您是否想要回复以 F11 作为抓取动作?"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257
+msgid "Restore grab shortcut F11"
+msgstr "回复抓取快捷键 F11"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:262
+msgid "JOSM is stopped for the change to take effect."
+msgstr "JOSM 已停止以便让变更生效。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:368
+#, java-format
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgstr "警告：无法将选项窗格置于最上层。例外为：{0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
+msgid "Replace original background by JOSM background color."
+msgstr "以 JOSM 背景颜色取代原始背景。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+msgid "Reverse grey colors (for black backgrounds)."
+msgstr "反转灰色(用于黑色背景)。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
+msgid "Set background transparent."
+msgstr "设定背景透明度。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
+msgid "Draw boundaries of downloaded data."
+msgstr "绘出已下载数据的边界。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:290
+msgid "Disable image cropping during georeferencing."
+msgstr "在进行地理参照时停用图片剪裁。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
+msgid "Use \"Tableau d''assemblage\""
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
+msgid "Select first WMS layer in list."
+msgstr "先在清单中选取一个 WMS 图层。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
+msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
+msgstr ""
+
+#. item "Man Made/Pipeline" combo "Type"
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--waterway tags -->
+#.
+#. <rule>
+#. <condition k="waterway" v="river"/>
+#. color riverbank
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="canal"/>
+#. color stream
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="ditch"/>
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="waterway" v="drain"/>
+#. color marsh
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="water"/>
+#. <icon src="nautical/water.png"/>
+#. color water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="coastline"/>
+#. <icon src="misc/no_icon.png"/>
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_style.java:1035 build/trans_style.java:1051
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
+msgid "water"
+msgstr "水域"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
+msgid "symbol"
+msgstr "符号"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+msgid "parcel"
+msgstr "包裹"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
+msgid "parcel number"
+msgstr "地号"
+
+#. color area
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:housenumber"/>
+#. <icon annotate="true" src="misc/housenumber.png" priority="-50000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:postcode"/>
+#. <icon annotate="true" src="misc/housenumber.png" priority="-50000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="odd"/>
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="even"/>
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="all"/>
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
+msgid "address"
+msgstr "住址"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+msgid "locality"
+msgstr "所在地"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:78
+msgid "section"
+msgstr "节"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+msgid "commune"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:84
+msgid "Enable automatic caching."
+msgstr "启用自动缓存。"
+
+#. disabled by default
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87
+msgid "Max. cache size (in MB)"
+msgstr "最大缓存容量 (MB)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97
+msgid ""
+"A special handler of the French cadastre wms at www.cadastre.gouv."
+"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
+"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
+"by this plugin."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102
+msgid "French cadastre WMS"
+msgstr "法国 cadastre WMS"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgstr "<html>当自动来源啓用时设定键 \"source\" 的数值</html>"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:110
+msgid "Source"
+msgstr "来源"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:116
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
+msgid ""
+"Replace the original white background by the backgound color defined in JOSM "
+"preferences."
+msgstr "将原始的白色背景以在 JOSM 偏好设定中定义的背景颜色取代。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
+msgstr "反转原始的黑色与白色(和所有中间的灰色)。当文字在暗色背景中时很有用。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:131
+msgid "Allows multiple layers stacking"
+msgstr "允许多重图层堆叠"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:136
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgstr "设定 WMS 图层透明度。右边是不透明，左边是透明。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
+msgid "Draw a rectangle around downloaded data from WMS server."
+msgstr "在从 WMS 服务器下载的数据周围绘出一个矩形。"
+
+#. option to select the single grabbed image resolution
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151
+msgid "Image resolution:"
+msgstr "图片解析度："
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
+msgid "High resolution (1000x800)"
+msgstr "高解析度 (1000x800)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163
+msgid "Medium resolution (800x600)"
+msgstr "中解析度 (800x600)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:165
+msgid "Low resolution (600x400)"
+msgstr "低解析度 (600x400)"
+
+#. option to select image zooming interpolation method
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181
+msgid "Image filter interpolation:"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183
+msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgstr "最邻近 (最快) [预设值]"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:184
+msgid "Bilinear (fast)"
+msgstr "双线性 (快速)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
+msgid "Bicubic (slow)"
+msgstr "双立体 (慢速)"
+
+#. the vectorized images multiplier
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:199
+msgid "Vector images grab multiplier:"
+msgstr "矢量图片抓取倍数："
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211
+msgid "Grab one image full screen"
+msgstr "抓取一张全屏图片"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219
+msgid "Grab smaller images (higher quality but use more memory)"
+msgstr "抓取较小的图片(较高的品质但消耗更多内存)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:223
+msgid "Fixed size square (default is 100m)"
+msgstr "固定大小矩形(预设为 100m)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:243
+msgid "Fixed size (from 25 to 1000 meters)"
+msgstr "固定大小(从 25 到 100 公尺)"
+
+#. WMS layers selection
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:248
+msgid "Layers:"
+msgstr "图层："
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:251
+msgid "See, rivers, swimming pools."
+msgstr "海、河流、游泳池。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:254
+msgid "Buildings, covers, underground constructions."
+msgstr "建筑、遮蔽物、地下建筑物。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:257
+msgid "Symbols like cristian cross."
+msgstr "符号，像十字架之类。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:260
+msgid "Parcels."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:263
+msgid "Parcels numbers, street names."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:266
+msgid "Address, houses numbers."
+msgstr "地址、门牌号码"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:269
+msgid "Locality, hamlet, place."
+msgstr "所在地、村庄、位置。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:272
+msgid "Cadastral sections and subsections."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:275
+msgid "Municipality administrative borders."
+msgstr "自治行政区边界。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:283
+msgid "Raster images grab multiplier:"
+msgstr "点阵图片抓取倍数："
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:294
+msgid ""
+"Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab."
+msgstr ""
+
+#. the crosspiece display
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:297
+msgid "Display crosspieces:"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:331
+msgid "Oldest files are automatically deleted when this size is exceeded"
+msgstr "当超过这个大小时较旧的文件会自动删除"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:340
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
+msgstr "如果抓取时有多个图层则自动选择第一个 WMS 图层。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348
+msgid "Enable this to use the tag \"add:street\" on nodes."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88
+msgid "Add \"source=...\" to elements?"
+msgstr "将 \"source=...\" 加入元件?"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:51
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:23
+#, java-format
+msgid "Downloading {0}"
+msgstr "正在下载 {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:56
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:32
+msgid "Contacting WMS Server..."
+msgstr "正在连接 WMS 服务器..."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:166
+msgid "Create buildings"
+msgstr "建立建筑"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:271
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
+msgstr ""
+"要避免 cadastre WMS 超载，\n"
+"建筑输入的大小限制在最大 1 km2。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:276
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:221
+msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
+msgid "Extract SVG ViewBox..."
+msgstr "解开 SVG ViewBox..."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:70
+msgid "Extract best fitting boundary..."
+msgstr "解出最合适的边界..."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:134
+msgid "Create boundary"
+msgstr "建立边界"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:33
+msgid "Contacting cadastre WMS ..."
+msgstr "正在连系 cadastre WMS ..."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:40
+msgid "Image already loaded"
+msgstr "图片已载入"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:76
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
+msgid "Extract commune boundary"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
+msgid "Only on vectorized layers"
+msgstr "只在矢量式图层"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+msgid "Grab building layer only"
+msgstr "只抓取建筑物图层"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:96
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
+msgstr ""
+"要启用 cadastre WMS 插件，\n"
+"请改变目前的投影法为 cadastre 投影法\n"
+"后再试一次"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+msgid "Download Image from French Cadastre WMS"
+msgstr "从法国 Cadastre WMS 下载图片"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#, java-format
+msgid "Cadastre: {0}"
+msgstr "Cadastre: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:55
+msgid "Grab non-georeferenced image"
+msgstr "抓取非地理参照的图片"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:79
+msgid "Georeferencing interrupted"
+msgstr "地理参照被中断"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:115
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
+msgstr ""
+"这张图片包含地理参照数据。\n"
+"您是否想要使用它们?"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:186
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"点击剪裁图片的第一个角落\n"
+"(需要两个点)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:187
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:206
+msgid "Image cropping"
+msgstr "图片剪裁"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:205
+msgid "Click second corner for image cropping"
+msgstr "点击剪裁图片的第二个角落"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:225
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:226
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:245
+msgid "Image georeferencing"
+msgstr "图片地理参照"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:244
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:275
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"您是否想要完全取消或是\n"
+"要再试一次 "
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:292
+msgid "Enter cadastre east,north position"
+msgstr "输入 cadastre 东,北 方位置"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:294
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(警告：检验有箭头的北方!!)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:296
+msgid "East"
+msgstr "东"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:297
+msgid "North"
+msgstr "北"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:308
+msgid "I use the mouse"
+msgstr "我使用鼠标"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:318
+#, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "设定 {0} 兰勃特坐标"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24
+msgid "Load location from cache (only if cache is enabled)"
+msgstr "从缓存载入位置(只有在缓存已启用时)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
+#, java-format
+msgid "{0} not allowed with the current projection"
+msgstr "{0} 不允许使用目前的投影法"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
+#, java-format
+msgid ""
+"Cannot load cache {0} which is not compatible with current projection zone"
+msgstr "不能载入缓存 {0}，因为与目前的投影法区域不相容"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
+#, java-format
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgstr "选取的文件 {0} 不是这个插件的缓存文件(无效的字节)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
+#, java-format
+msgid "The location {0} is already on screen. Cache not loaded."
+msgstr "位置 {0} 已经在画面上。缓存未载入。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
+msgid "(optional)"
+msgstr "(选择性的)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
+msgid "Change location"
+msgstr "改变位置"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
+msgid "Set a new location for the next request"
+msgstr "为下个要求设定新的位置"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:68
+msgid "Add a new municipality layer"
+msgstr "加入新的自治区图层"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
+msgid "Commune"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:72
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
+msgstr ""
+"<html>输入镇、乡或城市名称。<br>使用在 www.cadastre.gouv.fr 已知的语法及标"
+"点。</html>"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
+msgid "Departement"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
+msgid "<html>Departement number (optional)</html>"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:99
+msgid "Add new layer"
+msgstr "加入新的图层"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
+msgid "Reset cookie"
+msgstr "重设 cookie"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
+msgid "Get a new cookie (session timeout)"
+msgstr "取得新的 cookie(作业阶段逾时)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
+msgid "PNG files (*.png)"
+msgstr "PNG 文件 (*.png)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:45
+msgid "Export as PNG format (only raster images)"
+msgstr "输出为 PNG 格式 (只有点阵图)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:39
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41
+msgid "Adjust WMS"
+msgstr "调整 WMS"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:40
+msgid "Adjust the position of the WMS layer (raster images only)"
+msgstr "调整 WMS 图层的地点 (只有点阵图)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:68
+msgid ""
+"This mode works only if active layer is\n"
+"a cadastre \"plan image\" (raster image)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:47
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
+msgstr ""
+"发现一个以上的　WMS 图层\n"
+"请先选择它们中的一个，然后重试"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
+msgid "Blank Layer"
+msgstr "空白图层"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr "WMS 图层 ({0})，已载入 {1} 个拼贴"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+msgid "Is not vectorized."
+msgstr "并非矢量化的。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#, java-format
+msgid "Raster size: {0}"
+msgstr "点阵大小：{0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+msgid "Is vectorized."
+msgstr "是矢量化的。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
+#, java-format
+msgid "Commune bbox: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
+#, java-format
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
+msgstr ""
+"不支持的缓存文件版本；找到 {0}，应为 {1}\n"
+"建立一个新的。"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
+msgid "Cache Format Error"
+msgstr "缓存格式错误"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr "缓存中的兰勃特区 {0} 与目前的兰勃特区 {1} 不相容"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+msgid "Cache Lambert Zone Error"
+msgstr "缓存兰勃特区发生错误"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+msgid "Use"
+msgstr "使用"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76
+msgid "Please select a scheme to use."
+msgstr "请选择要使用的配置。"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86
+msgid "Color Scheme"
+msgstr "色彩配置"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100
+msgid "Please select the scheme to delete."
+msgstr "请选择要删除的配置。"
+
+#. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+msgid "Use the selected scheme from the list."
+msgstr "使用从清单选取的配置。"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:113
+msgid "Use the current colors as a new color scheme."
+msgstr "使用目前的颜色作为新的颜色配置。"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:114
+msgid "Delete the selected scheme from the list."
+msgstr "从清单中删除选取的配置。"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:116
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127
+msgid "Color Schemes"
+msgstr "颜色配置"
+
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
+msgid "Split area"
+msgstr "分离区域"
+
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
+msgid "Splits an area by an untagged way."
+msgstr "以未加标签的路径分离出区域。"
+
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:78
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
+msgstr ""
+"选取的区域不能分离，因为它是某个关系的成员。\n"
+"在分离它之前请先将区域自关系中删除。"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:37
+msgid "TangoGPS Files (*.log)"
+msgstr "TangoGPS 文件 (*.log)"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+msgid "Format errors: "
+msgstr "格式错误： "
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+msgid "TangoGPS import success"
+msgstr "TangoGPS 输入成功"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+msgid "TangoGPS import failure!"
+msgstr "TangoGPS 输入失败!"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
+msgid "TCX Files (*.tcx)"
+msgstr "TCX 文件 (*.tcx)"
+
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
+msgid "Download along..."
+msgstr ""
+
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
+msgid "Download OSM data along the selected ways."
+msgstr ""
+
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
+msgid "Download Along"
+msgstr ""
+
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
+msgid "Please select 1 or more ways to download along"
+msgstr ""
+
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
+#, java-format
+msgid "{0} intermediate nodes to download."
+msgstr ""
+
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
+#, java-format
+msgid "between {0} {1} and {2} {3}"
+msgstr ""
+
+#: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
+#, java-format
+msgid "  adding {0} {1}"
+msgstr ""
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
+msgid "Duplicate Way"
+msgstr "重制路径"
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:76
+msgid "Duplicate selected ways."
+msgstr "重制选取的路径。"
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
+msgid "Can't duplicate unordered way."
+msgstr "不能重制未排序的路径。"
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:90
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:134
+msgid "No data loaded."
+msgstr "没有载入数据。"
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
+msgid "You must select at least one way."
+msgstr "您必须选择至少一条路径。"
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:240
+msgid "Create duplicate way"
+msgstr "建立重复的路径"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
+msgid "Layer for editing GPX tracks"
+msgstr "编辑 GPX 轨迹的图层"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
+msgid "Convert to GPX layer with anonymised time"
+msgstr "转换为没有时间的 GPX 图层"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java:161
+msgid "EditGpx"
+msgstr "编辑Gpx"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
+msgid "edit gpx tracks"
+msgstr "编辑 gpx 轨迹"
+
+#. TODO what is icon at the end?
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+msgid "Import path from GPX layer"
+msgstr "从 GPX 图层输入路径"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+msgid "Drop existing path"
+msgstr "放弃现有的路径"
+
+#. no gps layer
+#. TODO: register a listener and show menu entry only if gps layers are available
+#. no gps layer
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+msgid "No GPX data layer found."
+msgstr "找不到 GPX 数据图层。"
+
+#: ../plugins/ext_tools/src/ext_tools/ExtTool.java:188
+msgid "Child script have returned invalid data."
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+msgid "Edit tool"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
+msgid "CmdLine:"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:26
+msgid "External tools"
+msgstr ""
+
+#. Plugin ext_tools
+#: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:27
+#: build/trans_plugins.java:26
+msgid "Use external scripts in JOSM"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:73
+#, java-format
+msgid "Delete tool \"{0}\"?"
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
+msgid "Are you sure?"
+msgstr "您确定吗?"
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
+msgid "New tool..."
+msgstr ""
+
+#: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
+msgid "Install"
+msgstr ""
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
+msgid "Position only"
+msgstr "只有位置"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:82
+msgid "Position, Time, Date, Speed"
+msgstr "位置, 时间, 日期, 速度"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:83
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr "位置, 时间, 日期, 速度, 高度"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85
+msgid "A By Time"
+msgstr "A 依时间"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:86
+msgid "A By Distance"
+msgstr "A 依距离"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:87
+msgid "B By Time"
+msgstr "B 依时间"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:88
+msgid "B By Distance"
+msgstr "B 依距离"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:89
+msgid "C By Time"
+msgstr "C 依时间"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:90
+msgid "C By Distance"
+msgstr "C 依距离"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:137
+msgid "Data Logging Format"
+msgstr "数据记录格式"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:151
+msgid "Disable data logging if speed falls below"
+msgstr "停用数据记录速限"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177
+msgid "Disable data logging if distance falls below"
+msgstr "停用数据记录距离"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
+msgid "Unknown logFormat"
+msgstr "不明的记录格式"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86
+msgid "Port:"
+msgstr "端口："
+
+#. Strings in JFileChooser
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
+#: build/specialmessages.java:62
+msgid "Refresh"
+msgstr "重新整理"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100
+msgid "refresh the port list"
+msgstr "重新整理端口清单"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:108
+msgid "Configure"
+msgstr "设定"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:116
+msgid "Configure Device"
+msgstr "设定装置"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:125
+msgid "Connection Error."
+msgstr "连接错误。"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:130
+msgid "configure the connected DG100"
+msgstr "设定连接的 DG100"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:139
+msgid "delete data after import"
+msgstr "输入后删除数据"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:44
+msgid "Importing data from device."
+msgstr "从装置输入数据"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:49
+msgid "Importing data from DG100..."
+msgstr "从 DG100 输入数据..."
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:63
+msgid "Error deleting data."
+msgstr "删除数据时发生错误。"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:69
+#, java-format
+msgid "imported data from {0}"
+msgstr "数据已从 {0} 输入"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:72
+msgid "No data found on device."
+msgstr "在装置上找不到数据。"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77
+msgid "Connection failed."
+msgstr "连接失败。"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:97
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
+msgstr ""
+"不能载入 rxtxSerial 程序库。如果您需要安装上的支持，试试在 http://www."
+"raphael-mack.de/josm-globalsat-gpx-import-plugin/ 的 Globalsat 首页"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
+msgid "Globalsat Import"
+msgstr "Globalsat 输入"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:108
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgstr "从 Globalsat Datalogger DG100 输入数据到 GPX 图层。"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:115
+msgid "Import"
+msgstr "输入"
+
+#: ../plugins/grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+msgstr "格线原始位置"
+
+#: ../plugins/grid/src/grid/GridLayer.java:197
+msgid "Grid rotation"
+msgstr "格线旋转"
+
+#: ../plugins/grid/src/grid/GridLayer.java:199
+msgid "World"
+msgstr "世界"
+
+#: ../plugins/grid/src/grid/GridLayer.java:200
+msgid "Grid layout"
+msgstr "格线配置"
+
+#: ../plugins/grid/src/grid/GridLayer.java:222
+msgid "Grid layer:"
+msgstr "格线图层："
+
+#: ../plugins/grid/src/grid/GridPlugin.java:27
+msgid "Add grid"
+msgstr "加入格线"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
+msgid "Normal"
+msgstr "一般"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:57
+msgid "Rotate 90"
+msgstr "旋转 90 度"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:59
+msgid "Rotate 180"
+msgstr "旋转 180 度"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:61
+msgid "Rotate 270"
+msgstr "旋转 270 度"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:108
+msgid "Previous image"
+msgstr "上一幅图片"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
+msgid "Next image"
+msgstr "下一幅图片"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:144
+msgid "Rotate left"
+msgstr "向左旋转"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:146
+msgid "Rotate image left"
+msgstr "将图片向左旋转"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:163
+msgid "Rotate right"
+msgstr "向右旋转"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:165
+msgid "Rotate image right"
+msgstr "将图片向右旋转"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:187
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
+msgid "WayPoint Image"
+msgstr "航点图片"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
+msgid "Display non-geotagged photos"
+msgstr "显示无 geotag 的相片"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
+msgid "Imported Images"
+msgstr "输入的图片"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:35
+msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
+msgstr "图片文件 (*.jpg, *.jpeg, *.png, *.gif)"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:45
+msgid "Open images with ImageWayPoint"
+msgstr "以 ImageWayPoing 开启图片"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
+msgid "Load set of images as a new layer."
+msgstr "将多组图片载入为新的图层。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
+msgid "Direction index '{0}' not found"
+msgstr "找不到方向索引 \"{0}\""
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
+msgid "The starting location was not within the bbox"
+msgstr "开始的位置不在 bbox 内"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
+msgid "Looking for shoreline..."
+msgstr "寻找海岸线..."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
+#, java-format
+msgid "{0} nodes so far..."
+msgstr "目前 {0} 个节点..."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+msgid "Lake Walker."
+msgstr "Lake Walker。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:19
+msgid "Lake Walker"
+msgstr "Lake Walker"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:113
+#, java-format
+msgid "Error creating cache directory: {0}"
+msgstr "建立缓存目录时发生错误：{0}"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:146
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:75
+msgid "Tracing"
+msgstr "正在追踪"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:148
+msgid "checking cache..."
+msgstr "正在检查缓存..."
+
+#. *
+#. * Run the nodelist through a vertex reduction algorithm
+#.
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
+msgid "Running vertex reduction..."
+msgstr "正在执行端点缩减..."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:199
+msgid "Running Douglas-Peucker approximation..."
+msgstr "执行近似 Douglas-Peucker..."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
+msgid "Removing duplicate nodes..."
+msgstr "正在删除重复的节点..."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
+msgid "Lakewalker trace"
+msgstr "Lakewalker 轨迹"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerException.java:14
+msgid "An unknown error has occurred"
+msgstr "发生不明的错误"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+msgid "east"
+msgstr "东"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+msgid "northeast"
+msgstr "东北"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+msgid "north"
+msgstr "北"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+msgid "northwest"
+msgstr "西北"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "west"
+msgstr "西"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "southwest"
+msgstr "西南"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "south"
+msgstr "南"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "southeast"
+msgstr "东南"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+msgid "coastline"
+msgstr "海岸线"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+msgid "land"
+msgstr "陆地"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+msgid "Maximum number of segments per way"
+msgstr "每路径的最大区段数"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+msgid "Maximum number of nodes in initial trace"
+msgstr "初始化轨迹的最大节点数"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+msgid "Maximum gray value to count as water (0-255)"
+msgstr "判断为水域的最大灰色值 (0-255)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+msgid "Line simplification accuracy (degrees)"
+msgstr "线条简化准确度(度)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+msgid "Resolution of Landsat tiles (pixels per degree)"
+msgstr "Landsat 拼贴的解析度(每一度的像素)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+msgid "Size of Landsat tiles (pixels)"
+msgstr "Landsat 拼贴的大小(像素)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+msgid "Shift all traces to east (degrees)"
+msgstr "所有轨迹向东平移(度)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+msgid "Shift all traces to north (degrees)"
+msgstr "所有轨迹向北平移(度)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+msgid "Direction to search for land"
+msgstr "查找陆地的方向"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+msgid "Tag ways as"
+msgstr "将路径标记为"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+msgid "WMS Layer"
+msgstr "WMS 图层"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+msgid "Maximum cache size (MB)"
+msgstr "最大缓存大小 (MB)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+msgid "Maximum cache age (days)"
+msgstr "最大缓存留存时间(天)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
+msgid "Source text"
+msgstr "来源文字"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgstr "在每个产生的路径中允许的最大区段数。预设为 250。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
+msgstr "在简化线条前产生最大的节点数目。预设值为 50000。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
+msgstr ""
+"被认定为水域的最大灰色数值(基于 Landsat IR-1 数据。可以是范围 0-255。预设值"
+"为 90。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+msgstr ""
+"Douglas-Peucker 线条简化的准确度，以度为测量单位。<br>较低的数值会产生较多的"
+"节点，和更准确的线条。预设值为 0.0003。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgstr "Landsat 拼贴的解析度，以每一度像素为测量单位。预设值为 4000。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgstr "一个 landsat 拼贴的大小，以像素为测量单位。预设值为 2000。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+msgid "Offset all points in East direction (degrees). Default 0."
+msgstr "所有点向东方移位(度)。预设值为 0。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+msgid "Offset all points in North direction (degrees). Default 0."
+msgstr "所有点向北方移位(度)。预设值为 0。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+msgid "Direction to search for land. Default east."
+msgstr "查找陆地方向。预设值为东方。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgstr "将路径加上标签成为水域、海岸线、陆地或都不是。预设值为水域。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgstr "再次追踪时要使用的 WMS 图层。预设值为 IR1。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr "每个缓存目录的最大容量(字节组)。预设值为 300MB"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr "每个缓存文件留存的最大天数。预设值为 100"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+msgid "Data source text. Default is Landsat."
+msgstr "数据来源文字。预设值为 Landsat。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+msgid "A plugin to trace water bodies on Landsat imagery."
+msgstr "用来追踪 Landsat 图库中水域的插件。"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
+msgid "Lakewalker Plugin Preferences"
+msgstr "Lakewalker 插件偏好设定"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
+msgid "Downloading image tile..."
+msgstr "正在下载图片拼贴..."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
+msgid "Could not acquire image"
+msgstr "无法撷取图片"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:149
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:171
+msgid "Not connected"
+msgstr "未连接"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:162
+msgid "Connection Failed"
+msgstr "连接失败"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:192
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:208
+msgid "Connecting"
+msgstr "正在连接"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:233
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:248
+msgid "Connected"
+msgstr "已连接"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
+msgid "no name"
+msgstr "没有名称"
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
+msgid "Live GPS"
+msgstr "Live GPS"
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
+msgid "Show GPS data."
+msgstr "显示 GPS 数据。"
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:50
+msgid "Status"
+msgstr "状态"
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:52
+msgid "Way Info"
+msgstr "路径信息"
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:58
+msgid "Speed"
+msgstr "速度"
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:60
+msgid "Course"
+msgstr "道路"
+
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+msgid "LiveGPS layer"
+msgstr "LiveGPS 图层"
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90
+msgid "Capture GPS Track"
+msgstr "撷取 GPS 轨迹"
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr "连接至 gpsd 服务器并在 LiveGPS 图层中显示目前的位置。"
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72
+msgid "Center Once"
+msgstr "置中一次"
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
+msgid "Center the LiveGPS layer to current position."
+msgstr "将 LiveGPS 图层置中于目前的位置。"
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86
+msgid "Auto-Center"
+msgstr "自动置中"
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88
+msgid "Continuously center the LiveGPS layer to current position."
+msgstr "持续将 LiveGPS 图层置中到目前的位置。"
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:120
+msgid "LiveGPS"
+msgstr "LiveGPS"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:66
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
+msgid "Measured values"
+msgstr "测量的数值"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:66
+msgid "Open the measurement window."
+msgstr "开启测量视窗。"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
+msgid "Reset"
+msgstr "重新设定"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:73
+msgid "Reset current measurement results and delete measurement path."
+msgstr "重设目前的测量结果并删除测量路径。"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:79
+msgid "Path Length"
+msgstr "路径长度"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:84
+msgid "Selection Length"
+msgstr "选择区域长度"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:89
+msgid "Selection Area"
+msgstr "选择区域"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java:44
+msgid "Angle"
+msgstr "角度"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:95
+msgid "Angle between two selected Nodes"
+msgstr "两个已取选节点间的角度"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+msgid "Layer to make measurements"
+msgstr "要进行测量的图层"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementMode.java:47
+msgid "Can not draw outside of the world."
+msgstr "不能画到这个世界以外的地方。"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:23
+msgid "measurement mode"
+msgstr "测量模式"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:39
+msgid "Measurements"
+msgstr "测量"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:49
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52
+msgid "Michigan Left"
+msgstr "密西根左转"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr "为 4 或 5 条路径加入禁止左转。"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:72
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "请选择 4 或 5 条要指派禁止左转的路径。"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:89
+msgid "Please select 4 ways that form a closed relation."
+msgstr "请从封闭的关系选择 4 条路径。"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:113
+msgid "Unable to order the ways. Please verify their directions"
+msgstr "无法排序路径。请检验它们的方向"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:127
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201
+msgid "Create Michigan left turn restriction"
+msgstr "建立密西根左转弯限制"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160
+msgid "Unable to find via nodes. Please check your selection"
+msgstr "无法透过节点找到。请检查您的选择区域"
+
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:38
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:41
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:22
+msgid "Convert to multipolygon"
+msgstr "转换为多重多边形"
+
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:39
+msgid "Convert to multipolygon."
+msgstr "转换为多重多边形。"
+
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:81
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:94
+msgid "One of the selected ways is already part of another multipolygon."
+msgstr "选取的路径中之一已经是另一个多重多边形的一部分。"
+
+#. Commit
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:118
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:51
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:160
+#: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:21
+msgid "Create multipolygon"
+msgstr "建立多重多边形"
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+msgid "Create multipolygon."
+msgstr "建立多重多边形。"
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:120
+msgid "Multipolygon must consist only of closed ways."
+msgstr "多重多边形必须由封闭的路径组成。"
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:140
+msgid "You must select at least two ways."
+msgstr "您必须选择至少两条路径。"
+
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+msgid "OpenLayers"
+msgstr "OpenLayers"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
+msgid "OpenStreetBugs download loop"
+msgstr "OpenStreetBugs 下载回圈"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
+msgid "Displays OpenStreetBugs issues"
+msgstr "显示 OpenStreetBugs 议题"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:106
+msgid ""
+"<html>The openstreetbugs plugin is using the old server at appspot.com.<br>A "
+"new server is available at schokokeks.org.<br>Do you want to switch to the "
+"new server? (Strongly recommended)</html>"
+msgstr ""
+"<html>openstreetbugs 插件用的是在 appspot.com 的旧服务器。<br>新的服务器在 "
+"schokokeks.org。<br>是否要切换至新的服务器?(强烈建议)</html>"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
+msgid "Switch to new openstreetbugs server?"
+msgstr "是否切换至新的 openstreetbugs 服务器?"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
+msgid ""
+"<html>The selected data contains data from OpenStreetBugs.<br>You cannot "
+"upload this data. Maybe you have selected the wrong layer?"
+msgstr ""
+"<html>选取的数据包含来自 OpenStreetBugs 的数据。<br>您不能上传这数据。您可能"
+"选择了错误的图层?"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "发生一个错误：{0}"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
+msgid "Couldn't create new bug. Result: {0}"
+msgstr "无法建立新的错误报告。结果：{0}"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
+msgid "Header contains several values and cannot be mapped to a single string"
+msgstr "标头包含许多数值而且不能对映为单一字串"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+msgid "Process queue"
+msgstr "程序伫列"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:112
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
+msgid "Open OpenStreetBugs"
+msgstr "开启 OpenStreetBugs"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:113
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr "开启 OpenStreetBugs 视窗并使用自动下载"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:119
+msgid "Bug list"
+msgstr "程序错误清单"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:142
+msgid ""
+"The visible area is either too small or too big to download data from "
+"OpenStreetBugs"
+msgstr "可视区域可能太小或太大以致无法从 OpenStreetBugs 下载数据"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:186
+msgid "Queue"
+msgstr "伫列"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
+msgid "offline"
+msgstr "离线"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
+msgid "online"
+msgstr "上线"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
+#, java-format
+msgid "OpenStreetBugs ({0})"
+msgstr "OpenStreetBugs ({0})"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
+msgid "Add a comment"
+msgstr "加入评论"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
+msgid "Enter your comment"
+msgstr "输入您的评论"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+msgid "Comment: "
+msgstr "注解： "
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
+msgid "Mark as done"
+msgstr "标记为完成"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
+msgid "Really close?"
+msgstr "真的要结案吗?"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+"<html>确定将这个议题标记为\"已解决\"?<br><br>您也许可以加入额外的注解：</"
+"html>"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+msgid "Close: "
+msgstr "关闭： "
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
+msgid "New issue"
+msgstr "新增议题"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
+msgid "Create issue"
+msgstr "建立议题"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
+msgid "Describe the problem precisely"
+msgstr "明确的描述此问题"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+msgid "Create: "
+msgstr "建立： "
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
+msgid "Please enter a user name"
+msgstr "请输入使用者名称"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
+msgid "Unknown issue state"
+msgstr "不明的议题状态"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr "切换至上线模式"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr "切换至离线模式"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr "您的伫列中有未保存的变更。是否要立刻送出它们?"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+msgid "OpenStreetBugs"
+msgstr "OpenStreetBugs"
+
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
+msgid "Open Visible..."
+msgstr "开启可见的..."
+
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49
+msgid "Open only files that are visible in current view."
+msgstr "只开启在目前的检视中可见的文件。"
+
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:59
+msgid "No view open - cannot determine boundaries!"
+msgstr "没有开启检视 - 不能决定边界!"
+
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:114
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "不明的字节：{0}"
+
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:153
+msgid "Osmarender"
+msgstr "Osmarender"
+
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:114
+msgid ""
+"Firefox not found. Please set firefox executable in the Map Settings page of "
+"the preferences."
+msgstr "找不到 Firefox。请在偏好设定的地图设定页面设定 firefox 执行档。"
+
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:149
+msgid "Firefox executable"
+msgstr "Firefox 可执行档"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
+msgid "Read error!"
+msgstr "读取错误!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+msgid "Write error!"
+msgstr "写入错误!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "将坐标写入图片档头"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
+msgid "Write position information into the exif header of the following files:"
+msgstr "将地点信息写入下列文件的 exif 档头："
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+msgid "settings"
+msgstr "设定值"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+msgid "keep backup files"
+msgstr "保留备份文件"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
+msgid "change file modification time:"
+msgstr "改变文件修改时间："
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
+msgid "to gps time"
+msgstr "为 gps 时间"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
+msgid "to previous value (unchanged mtime)"
+msgstr "回到前一个数值(未变更 mtime)"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
+msgid "Photo Geotagging Plugin"
+msgstr "相片地理标签插件"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
+msgid "Writing position information to image files..."
+msgstr "将地点信息写入图片文件..."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
+msgid "Could not read mtime."
+msgstr "无法读取 mtime。"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
+msgid "Could not write mtime."
+msgstr "无法写入 mtime。"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
+msgid "File could not be deleted!"
+msgstr "无法删除文件!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
+msgid "Could not rename file!"
+msgstr "文件无法重新命名!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr "<html><h3>在图片目录中有旧的备份文件!</h3>"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
+msgid "Override old backup files?"
+msgstr "是否覆盖旧的备份文件?"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+msgid "Keep old backups and continue"
+msgstr "保留旧的备份并继续"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+msgid "Override"
+msgstr "覆盖"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
+msgid "Could not delete temporary file!"
+msgstr "无法删除暂存文件!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
+msgid "Test failed: Could not read mtime."
+msgstr "测试失败：无法读取 mtime。"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
+msgid "Test failed: Could not write mtime."
+msgstr "测试失败：无法写入 mtime。"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
+msgid "Calibration Files"
+msgstr "校准文件"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:53
+msgid "Load Picture Calibration..."
+msgstr "载入相片校准..."
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:53
+msgid "Loads calibration data to a file"
+msgstr "将校准数据载入到文件"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:79
+#, java-format
+msgid "Loading file failed: {0}"
+msgstr "载入文件失败：{0}"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
+msgid "PicLayer move"
+msgstr "PicLayer 移动"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
+msgid "Drag to move the picture"
+msgstr "拖曳以移动相片"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java:42
+msgid "New picture layer from clipboard"
+msgstr "来自剪贴簿的新相片图层"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:64
+msgid "Image files"
+msgstr "照片文件"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:73
+msgid "New picture layer from file..."
+msgstr "来自文件的新相片图层..."
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
+msgid "Image not created properly."
+msgstr "图片无法正确的建立。"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
+msgid "Could not find the map object."
+msgstr "找不到地图对象。"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java:45
+msgid "Nothing in clipboard"
+msgstr "剪贴簿中没有东西"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java:54
+msgid "The clipboard data is not an image"
+msgstr "剪贴簿数据不是图片"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
+msgid "PicLayer"
+msgstr "PicLayer"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
+msgid "Resets picture calibration"
+msgstr "重设相片校准"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java:44
+msgid "Resets picture rotation"
+msgstr "重设相片旋转"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java:44
+msgid "Reset position"
+msgstr "重设地点"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java:44
+msgid "Resets picture position"
+msgstr "重设相片的地点"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44
+msgid "Scale"
+msgstr "比例"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44
+msgid "Resets picture scale"
+msgstr "重设相片比例"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
+msgid "PicLayer rotate"
+msgstr "PicLayer 旋转"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
+msgid "Drag to rotate the picture"
+msgstr "拖曳以旋转相片"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52
+msgid "Save Picture Calibration..."
+msgstr "保存相片校准..."
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52
+msgid "Saves calibration data to a file"
+msgstr "将校准数据保存到文件"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:81
+msgid "JOSM PicLayer plugin calibration data"
+msgstr "JOSM PicLayer 插件校准数据"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:85
+#, java-format
+msgid "Saving file failed: {0}"
+msgstr "保存文件失败：{0}"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
+msgid "PicLayer scale X"
+msgstr "PicLayer 缩放 X"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
+msgid "Drag to scale the picture in the X Axis"
+msgstr "拖曳以缩放相片的 X 轴"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
+msgid "PicLayer scale"
+msgstr "PicLayer 缩放"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
+msgid "Drag to scale the picture in the X and Y Axis"
+msgstr "拖曳以缩放相片的 X 轴和 Y 轴"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
+msgid "PicLayer scale Y"
+msgstr "PicLayer 缩放 Y"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
+msgid "Drag to scale the picture in the Y Axis"
+msgstr "拖曳以缩放相片的 Y 轴"
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
+msgid "Create Stops from GTFS ..."
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
+msgid "Create Stops from a GTFS file"
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230
+#, java-format
+msgid "IOException \"{0}\" occurred"
+msgstr "发生 IOException \"{0}\""
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
+msgid "GTFS-Stops"
+msgstr ""
+
+#. item "Bicycle/Rental" text "Name"
+#: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
+#: build/trans_presets.java:1422
+msgid "Public Transport"
+msgstr "大众运输"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:409
+msgid "Route patterns ..."
+msgstr "路线模式 ..."
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:410
+msgid "Edit Route patterns for public transport"
+msgstr "编辑大众运输的路线模式"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:422
+msgid "Overview"
+msgstr "概览"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:426
+msgid "Itinerary"
+msgstr "行程"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:428
+#: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:87
+msgid "Stops"
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:430
+msgid "Meta"
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:74
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:109
+msgid "Create Stops from GPX ..."
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75
+msgid "Create Stops from a GPX file"
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83
+msgid "Tracks"
+msgstr "轨迹"
+
+#. item "Ways/Steps" text "Width (meters)"
+#. </optional>
+#: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
+#: build/trans_presets.java:630
+msgid "Waypoints"
+msgstr "路标"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+msgid "load data from API"
+msgstr "从 API 载入数据"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+msgid "create new objects"
+msgstr "建立新的对象"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+msgid "change the selection"
+msgstr "改变选择区域"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+msgid "change the viewport"
+msgstr "改变检视端口"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "合并的版本"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
+msgid "confirm all Remote Control actions manually"
+msgstr "手动确认所有的远程控制动作"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+msgid "A plugin that allows JOSM to be controlled from other applications."
+msgstr "允许 JOSM 被其他应用程序控制的插件。"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+msgid "Remote Control"
+msgstr "远程控制"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+msgid "Settings for the Remote Control plugin."
+msgstr "远程控制插件的设定值。"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
+msgid ""
+"The Remote Control plugin will always listen on port 8111 on localhost.The "
+"port is not variable because it is referenced by external applications "
+"talking to the plugin."
+msgstr ""
+"远程控制插件会一直听取本机的 8111 端口。此端口是无法改变的，因为它参照了外部"
+"应用程序与此插件的沟通。"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
+msgid "Permitted actions"
+msgstr "准许的动作"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
+msgid "Remote Control has been asked to load data from the API."
+msgstr "远程控制被要求自 API 下载数据。"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#, java-format
+msgid "Request details: {0}"
+msgstr "要求的详细数据：{0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
+msgid "Do you want to allow this?"
+msgstr "您是否要允许这个?"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
+msgid "Confirm Remote Control action"
+msgstr "确认远程控制动作"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
+msgid "Remote Control has been asked to create a new node."
+msgstr "远程控制被要求建立新的节点。"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
+msgid "Remote Control has been asked to import data from the following URL:"
+msgstr "远程控制被要求自下列 URL 输入数据："
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+msgid "Revert changeset fully"
+msgstr "还原整个更改组合"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
+msgid "Revert selection only"
+msgstr "只还原选择区域"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
+msgid "Revert selection and restore deleted objects"
+msgstr "还原选择区域并复原已删除的对象"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
+msgid "Revert changeset"
+msgstr "还原更改组合"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
+msgid "Revert"
+msgstr "还原"
+
+#: ../plugins/reverter/src/reverter/ChangesetReverter.java:302
+#, java-format
+msgid "Missing merge target for {0} with id {1}"
+msgstr "缺少 id {1} {0} 的合并目标"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15
+#: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr "对象历史纪录"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15
+msgid "History reverter"
+msgstr "历史纪录还原"
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:52
+msgid "Preparing history data..."
+msgstr "正在准备历史纪录数据..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:50
+msgid "Reverting..."
+msgstr "正在还原..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:58
+msgid ""
+"This changeset has objects that are not present in current dataset.\n"
+"It is needed to download them before reverting. Do you want to continue?"
+msgstr ""
+"这个更改组合有未显现在目前数据组合的对象。\n"
+"在还原之前必须先下载它们。您是否确定要继续?"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:60
+msgid "Confirm"
+msgstr "确认"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:64
+msgid "Fetching missing primitives"
+msgstr "正在取回缺少的原型"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:75
+msgid "Downloading changeset"
+msgstr "正在下载更改组合"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:98
+#, java-format
+msgid "Revert changeset #{0}"
+msgstr "还原更改组合 #{0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
+msgid "Road Sign Plugin"
+msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
+msgid "Roadsign tagging"
+msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
+msgid "Add tags by clicking on road signs"
+msgstr ""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:54
+msgid "Roadsigns plugin: open dialog"
+msgstr "路标插件：打开对话框"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:89
+#, java-format
+msgid "Could not read tagging preset source: ''{0}''"
+msgstr "无法读取标签预设组合来源：\"{0}\""
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:97
+#, java-format
+msgid "Error parsing tagging preset from ''{0}'':\n"
+msgstr "从 ''{0}'' 解析标签预设组合时发生错误：\n"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108
+#, java-format
+msgid "Sign {0}"
+msgstr "标记 {0}"
+
+#: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115
+#, java-format
+msgid "Additional sign {0}"
+msgstr "附加标记 {0}"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
+msgid "Edit relation"
+msgstr "编辑关系"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
+msgid "Edit relations"
+msgstr "编辑关系"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:73
+msgid "No relation is selected"
+msgstr "尚未选取关系"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
+msgstr "从关系 \"{2}\" 删除位置 {1} 的节点 \"{0}\""
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:69
+#, java-format
+msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
+msgstr "从关系 \"{2}\" 删除位置 {1} 的路径 \"{0}\""
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:70
+#, java-format
+msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
+msgstr "从关系 \"{2}\" 删除位置 {1} 的关系 \"{0}\""
+
+#. TODO Use constructor with shortcut
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+msgid "Routing"
+msgstr "路线规画"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
+msgid "Click to add destination."
+msgstr "按这里加入目的地。"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr "点击并拖曳移动至目的端"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr "按这里删除目的地。"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "开启路线规画节点的清单"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
+msgid "Add routing layer"
+msgstr "加入路线规画图层"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+msgid "Criteria"
+msgstr "条件"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
+msgid "Shortest"
+msgstr "最短"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
+msgid "Fastest"
+msgstr "最快"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
+msgid "Reverse route"
+msgstr "反转路线"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
+msgid "Clear route"
+msgstr "清除路线"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
+msgid "Routing Plugin Preferences"
+msgstr "路线规画插件偏好设定"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
+msgid "Configure routing preferences."
+msgstr "设定路线规画偏好设定"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+msgid "Highway type"
+msgstr "公路类型"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
+msgid "Speed (Km/h)"
+msgstr "速限 (Km/h)"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
+msgid "Weight"
+msgstr "重量限制"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
+msgid "Enter weight values"
+msgstr "输入重量限制值"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
+msgid "Simplify Area"
+msgstr "简化区域"
+
+#: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
+msgid "Delete unnecessary nodes from an area."
+msgstr "从一个区域删除不必要的节点。"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
+msgid "Slippy Map"
+msgstr "快速地图"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
+msgid "Auto Zoom"
+msgstr "自动缩放"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
+msgid "Load Tile"
+msgstr "载入拼贴"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
+msgid "Show Tile Info"
+msgstr "显示拼贴信息"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
+msgid "Load All Tiles"
+msgstr "载入所有拼贴"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
+msgid "Increase zoom"
+msgstr "增加缩放"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
+msgid "Decrease zoom"
+msgstr "减少缩放"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
+msgid "Snap to tile size"
+msgstr "贴紧拼贴大小"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
+msgid "Flush Tile Cache"
+msgstr "清除拼贴缓存"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
+msgid "image "
+msgstr "图片 "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+msgid "autozoom"
+msgstr "自动缩放"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+msgid "autoload tiles"
+msgstr "自动载入拼贴"
+
+#. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+msgid "SlippyMap"
+msgstr "快速地图"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+msgid "Settings for the SlippyMap plugin."
+msgstr "快速地图插件的设定值。"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
+msgid "Tile Sources"
+msgstr "拼贴来源"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
+msgid "Auto zoom: "
+msgstr "自动缩放： "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
+msgid "Autoload Tiles: "
+msgstr "自动载入拼贴： "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
+msgid "Min zoom lvl: "
+msgstr "最小缩放等级： "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
+msgid "Max zoom lvl: "
+msgstr "最大缩放等级： "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
+msgid "Fade background: "
+msgstr "淡化背景： "
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
+msgid "AutoSave LiveData"
+msgstr "自动保存即时数据"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+msgid "Save captured data to file every minute."
+msgstr "每分钟把取得的数据保存为文件。"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:65
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:81
+#, java-format
+msgid "Error while exporting {0}: {1}"
+msgstr "输出 {0} 时发生错误：{1}"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
+msgid "Way: "
+msgstr "路径： "
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
+msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
+msgstr "按钮 \"{0}\" 有重复的热键 - 按钮会被忽略!"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:40
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
+msgstr "SurveyorPlugin 需要 LiveGpsPlugin，但是找不到它!"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
+msgid "Surveyor..."
+msgstr "测量员..."
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+msgid "Open surveyor tool."
+msgstr "开启测量员工具。"
+
+#. surveyorFrame.setTitle((String)getValue(AbstractAction.NAME));
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
+msgid "Surveyor"
+msgstr "测量员"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#, java-format
+msgid "Could not read surveyor definition: {0}"
+msgstr "无法读取测量员定义：{0}"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
+#, java-format
+msgid "Error parsing {0}: {1}"
+msgstr "分析 {0} 时发生错误：{1}"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:40
+msgid "Surveyor waypoint layer"
+msgstr "测量员航点图层"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
+#, java-format
+msgid "{0} start"
+msgstr "{0} 开始"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
+#, java-format
+msgid "{0} end"
+msgstr "{0} 结束"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:72
+msgid "Waypoint Description"
+msgstr "航点描述"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:25
+msgid "Edit tags"
+msgstr "编辑标签"
+
+#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:27
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:30
+msgid "Launches the tag editor dialog"
+msgstr "启动标签编辑器对话框"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:149
+msgid "JOSM Tag Editor Plugin"
+msgstr "JOSM 标签编辑器插件"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:290
+msgid "Abort tag editing and close dialog"
+msgstr "关闭此对话框并放弃标签的编辑"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:303
+msgid "Apply edited tags and close dialog"
+msgstr "接受已编辑的标签并关闭此对话框"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
+msgid "Highlight"
+msgstr "突显"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:169
+#, java-format
+msgid "Updating properties of up to {0} object"
+msgid_plural "Updating properties of up to {0} objects"
+msgstr[0] "更新 {0} 个对象之多的属性"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
+msgid "Group"
+msgstr "群组"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
+msgid "Item"
+msgstr "项目"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:58
+msgid "Clear"
+msgstr "清除"
+
+#. should not happen
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:82
+#, java-format
+msgid "unexpected column number {0}"
+msgstr "未预期的栏号 {0}"
+
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
+msgid "Tagging Preset Tester"
+msgstr "标签预设组合测试程序"
+
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
+msgid ""
+"Open the tagging preset test tool for previewing tagging preset dialogs."
+msgstr "开启标签预设组合测试工具以预览标签预设组合对话框。"
+
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
+msgid "You have to specify tagging preset sources in the preferences first."
+msgstr "您必须先在偏好设定中指定标签预设组合来源。"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:59
+msgid "Enter housenumbers or amount of segments"
+msgstr "输入门牌号码或一些区段"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:86
+msgid "Terrace a house"
+msgstr "连栋房屋"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "Interpolation"
+msgstr "插入补间"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:120
+msgid "Segments"
+msgstr "区段"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:157
+msgid "Lowest Number"
+msgstr "最低编号"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:159
+msgid "Lowest housenumber of the terraced house"
+msgstr "连栋房屋最小门牌号码"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:161
+msgid "Highest Number"
+msgstr "最高编号"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:162
+msgid "add to existing associatedStreet relation"
+msgstr "加入已经存在的 associatedStreet 关系"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:162
+msgid "create an associatedStreet relation"
+msgstr "建立 associatedStreet 关系"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:165
+msgid "delete outline way"
+msgstr "删除轮廓路径"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:185
+msgid "Street name: "
+msgstr "街道名称： "
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:268
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
+msgid "Even/Odd"
+msgstr "奇数/偶数"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:113
+msgid "Lowest number"
+msgstr "最低编号"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:117
+msgid "Highest number"
+msgstr "最高编号"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:159
+msgid "Lowest housenumber cannot be higher than highest housenumber"
+msgstr "最小门牌号码不能高于最大门牌号码"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:186
+msgid "Housenumbers do not match odd/even setting"
+msgstr "门牌号码不符合奇/偶数设定"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:211
+msgid "Segment must be a number greater 1"
+msgstr "区段必须为大于 1 的数字"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:235
+#, java-format
+msgid "{0} must be greater than 0"
+msgstr "{0} 必须大于 0"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:240
+#, java-format
+msgid "{0} is not a number"
+msgstr "{0} 并不是数字"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
+msgid "Reverse a terrace"
+msgstr "反转一排连栋建筑"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
+msgid "Reverses house numbers on a terrace."
+msgstr "反转在连栋建筑中房屋的编号。"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+msgid "Reverse a Terrace"
+msgstr "反转一排连栋建筑"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+msgid "Cannot reverse!"
+msgstr "不能还原!"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
+msgid "Reverse Terrace"
+msgstr "反转连栋建筑"
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
+#: ../plugins/terracer/src/terracer/TerracerAction.java:67
+msgid "Terrace a building"
+msgstr "将建筑连栋"
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:65
+msgid "Creates individual buildings from a long building."
+msgstr "从一长排建筑中建立个别建筑。"
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:127
+msgid "Select a single, closed way of at least four nodes."
+msgstr "选择至少有四个节点的单一、封闭的路径。"
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:288
+msgid "Terrace"
+msgstr "连栋建筑"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "分隔线"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse"
+msgstr "浏览"
+
+#: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
+msgid "Browse map with left button"
+msgstr "以左键浏览地图"
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
+msgid "Merge objects nodes"
+msgstr "合并对象节点"
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
+msgid "Tracer"
+msgstr "示踪器"
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
+msgid "Tracer."
+msgstr "示踪器。"
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:136
+msgid "Tracer building"
+msgstr "描出建筑物"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:43
+#, java-format
+msgid ""
+"Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
+"behind shortcut ''{1}'' by action ''{2}''"
+msgstr ""
+"警告：turnrestrictions 插件将快捷键 \"{1}\" 原本的动作 \"{0}\" 替换成动作 "
+"\"{2}\""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:67
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:111
+#, java-format
+msgid ""
+"Warning: illegal value ''{0}'' for preference key ''{1}''. Falling back to "
+"default value ''shift ctrl T''."
+msgstr ""
+"警告：偏好设定键 \"{1}\" 有不合格的数值 \"{0}\"。返回到预设值 \"shift ctrl T"
+"\"。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:90
+msgid "Create/Edit turn restriction..."
+msgstr "建立/编辑转弯限制..."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:92
+msgid "Create or edit a turn restriction."
+msgstr "建立或编辑转弯限制。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:42
+msgid ""
+"In the following table you can edit the <strong>raw tags</strong> of the OSM "
+"relation representing this turn restriction."
+msgstr ""
+"在下列表格中您可以编辑代表这个转弯限制的 OSM 关系的<strong>原始标签</"
+"strong>。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:62
+msgid ""
+"In the following table you can edit the <strong>raw members</strong> of the "
+"OSM relation representing this turn restriction."
+msgstr ""
+"在下列表格中您可以编辑代表这个转弯限制的 OSM 关系的<strong>原始成员</"
+"strong>。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+msgid "Type:"
+msgstr "类型："
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr "From:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr "To:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr "Vias:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
+msgid "Copy to the clipboard"
+msgstr "复制到剪贴簿"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java:423
+#, java-format
+msgid "Cannot find object with id ''{0}'' in layer ''{1}''"
+msgstr "在图层 \"{1}\" 中找不到 id \"{0}\" 的对象"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java:426
+#, java-format
+msgid ""
+"Cannot add object ''{0}'' as relation member because it is deleted or "
+"invisible in layer ''{1}''"
+msgstr ""
+"不能将对象 \"{0}\" 加入为关系成员，因为它已被删除或是在图层 \"{1}\" 中是不可"
+"视的"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:102
+msgid "Clear the selected roles or delete the selected members"
+msgstr "清除选取的角色或删除选取的成员"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:128
+msgid "Insert new relation members from object in the clipboard"
+msgstr "从剪贴簿的对象插入新的关系成员"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:167
+msgid "Move the selected relation members down by one position"
+msgstr "将选取的关系成员下移一个位置"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:194
+msgid "Move the selected relation members up by one position"
+msgstr "将选取的关系成员上移一个位置"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:134
+msgid "Edit basic attributes of a turn restriction"
+msgstr "编辑转弯限制的基本属性"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138
+msgid "Edit the raw tags and members of this turn restriction"
+msgstr "编辑这个转弯限制的原始标签和成员"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:141
+msgid "Errors/Warnings"
+msgstr "错误/警告"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:142
+msgid "Show errors and warnings related to this turn restriction"
+msgstr "显示与这个转弯限制相关的错误和警告"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:280
+#, java-format
+msgid "Create a new turn restriction in layer ''{0}''"
+msgstr "在图层 \"{0}\" 中建立新的转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:282
+#, java-format
+msgid "Edit a new turn restriction in layer ''{0}''"
+msgstr "在图层 \"{0}\" 中编辑新的转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:284
+#, java-format
+msgid "Edit turn restriction ''{0}'' in layer ''{1}''"
+msgstr "在图层 \"{1}\" 中编辑转弯限制 \"{0}\""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:398
+#, java-format
+msgid ""
+"There is still an unresolved error or warning identified for this turn "
+"restriction. You are recommended to resolve this issue first."
+msgid_plural ""
+"There are still {0} errors and/or warnings identified for this turn "
+"restriction. You are recommended to resolve these issues first."
+msgstr[0] "这个转弯限制仍有 {0} 未调解的错误或警告。建议您先调解这些问题。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:406
+msgid "Do you want to save anyway?"
+msgstr "您要强制保存吗?"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:409
+msgid "Yes, save anyway"
+msgstr "是，强制保存"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:411
+msgid "Save the turn restriction despite of errors and/or warnings"
+msgstr "保存这个转弯限制，不管错误和/或警告"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:415
+msgid "No, resolve issues first"
+msgstr "不，先调解冲突"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:417
+msgid "Cancel saving and start resolving pending issues first"
+msgstr "取消保存并先开始调解待解决的问题"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:425
+msgid "Pending errors and warnings"
+msgstr "未决的错误和警告"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:484
+#, java-format
+msgid ""
+"This turn restriction refers to an object which was deleted outside of this "
+"turn restriction editor:"
+msgid_plural ""
+"This turn restriction refers to {0} which were deleted outside of this turn "
+"restriction editor:"
+msgstr[0] "这个转弯限制参照到 {0} 已在这个转弯限制编辑器之外被删除："
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:497
+msgid ""
+"Updates to this turn restriction can''t be saved unless deleted members are "
+"removed.<br>How to you want to proceed?"
+msgstr ""
+"除非先删除已删除的成员否则不能保存对这个转弯限制的更新。<br>您想要如何处理?"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:502
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:504
+msgid "Remove deleted members and save"
+msgstr "删除已删除成员并保存"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:508
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:510
+msgid "Cancel and return to editor"
+msgstr "取消并回到编辑器"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:518
+msgid "Deleted members in turn restriction"
+msgstr "转弯限制中已删除的成员"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:597
+msgid "Create a conflict and close this turn restriction editor"
+msgstr "建立冲突项目并关闭这个转弯限制编辑器"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:603
+msgid "Return to the turn restriction editor and resume editing"
+msgstr "返回转弯限制编辑器并继续编辑"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:610
+msgid ""
+"<html>This turn restriction has been changed outside of the editor.<br>You "
+"cannot apply your changes and continue editing.<br><br>Do you want to create "
+"a conflict and close the editor?</html>"
+msgstr ""
+"<html>这个转弯限制已经在编辑器之外被改变了。<br>您不能应用您的变更并继续编"
+"辑。<br><br>您是否要建立一个冲突并关闭这个编辑器?</html>"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:627
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
+"resolve this conflict first, then try again.</html>"
+msgstr ""
+"html>图层 \"{0}\" 已经有冲突于对象<br>\"{1}\"。<br>请先调解这个冲突，然后再试"
+"一次。</html>"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
+msgid "Already participating in a conflict"
+msgstr "已经加入冲突中"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+msgid "Delete this turn restriction"
+msgstr "删除这个转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+msgid "Select this turn restriction"
+msgstr "选择这个转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
+msgstr "使用这个转弯限制所属的图层并缩放到它的大小"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:843
+#, java-format
+msgid "{0} warning"
+msgid_plural "{0} warnings"
+msgstr[0] "{0} 个警告"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:847
+#, java-format
+msgid "{0} error"
+msgid_plural "{0} errors"
+msgstr[0] "{0} 个错误"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:860
+msgid "no issues"
+msgstr "没有问题"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:147
+msgid "please select a way"
+msgstr "请选择一条路径"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:158
+#, java-format
+msgid "multiple objects with role ''{0}''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:245
+msgid "Delete from turn restriction"
+msgstr "从转弯限制删除"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:354
+msgid "Paste from the clipboard"
+msgstr "从剪贴簿粘贴"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:220
+msgid "Create new turn restriction"
+msgstr "建立新的转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:221
+msgid "Launch the turn restriction editor to create a new turn restriction"
+msgstr "执行转弯限制编辑器来建立新的转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:11
+msgid "No Right Turn"
+msgstr "禁止右转"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:12
+msgid "No Left Turn"
+msgstr "禁止左转"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:13
+msgid "No U-Turn"
+msgstr "禁止廻转"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:14
+msgid "No Straight On"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:15
+msgid "Only Right Turn"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:16
+msgid "Only Left Turn"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:17
+msgid "Only Straight On"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:34
+#, java-format
+msgid "Warning: failed to load icon for turn restriction type ''{0}''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:75
+msgid "please select a turn restriction type"
+msgstr "选择转弯限制类型"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:59
+msgid ""
+"Select the vehicle types this turn restriction is <strong>not</strong> "
+"applicable for."
+msgstr "选择这个转弯限制 <strong>不</strong> 适用的车辆类型。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:82
+msgid "Public Service Vehicles"
+msgstr "大众运输车辆"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:83
+msgid "Public service vehicles like buses, tramways, etc."
+msgstr "大众服务车辆如公交车、有轨电车等"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:95
+msgid "Heavy Goods Vehicles"
+msgstr "大型车"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:108
+msgid "Motorcars"
+msgstr "汽车"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:122
+msgid "Bicycles"
+msgstr "自行车"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:193
+msgid "Use standard exceptions"
+msgstr "使用标准例外"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:203
+msgid "Use non-standard exceptions"
+msgstr "使用非标准例外"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:156
+msgid "Remove the currently selected vias"
+msgstr "删除目前选取的 vias"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:177
+msgid "Move the selected vias down by one position"
+msgstr "将选取的 vias 向下移动一个位置"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:203
+msgid "Move the selected vias up by one position"
+msgstr "将选取的 vias 向上移动一个位置"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:231
+msgid "Copy the selected vias to the clipboard"
+msgstr "复制选取的 vias 至剪贴簿"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:264
+msgid "Insert 'via' objects from the clipboard"
+msgstr "从剪贴簿插入 \"via\" 对象"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java:177
+#, java-format
+msgid ""
+"Failed to retrieve OSM object with id {0} from dataset {1}. Cannot add it as "
+"''via''."
+msgstr "无法从数据组合 {1} 取回 id {0} 的 OSM 对象。不能将它加为 \"via\"。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:125
+msgctxt "turnrestrictions"
+msgid "From:"
+msgstr "From:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:136
+msgctxt "turnrestriction"
+msgid "To:"
+msgstr "To:"
+
+#. FIXME: render as warning/error (red background?)
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:173
+msgid "no participating way with role ''from''"
+msgstr "没有加入 \"出发\" 角色的路径"
+
+#. FIXME: render as warning/error (red background?)
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:183
+msgid "no participating way with role ''to''"
+msgstr "没有加入 \"到达\" 角色的路径"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:104
+msgid "Only participating in selection"
+msgstr "只加入选择区域"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:106
+msgid ""
+"<html>Select to display turn restrictions related to object in the current "
+"selection only.<br>Deselect to display all turn restrictions in the current "
+"data set.</html>"
+msgstr ""
+"<html>选择以显示在目前选择区域的转弯限制相关对象。<br>取消选择则会显示目前数"
+"据组合中所有的转弯限制。</html>"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:162
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:107
+msgid "Turn Restrictions"
+msgstr "转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:164
+msgid "Display and manage turn restrictions in the current data set"
+msgstr "显示并管理在目前数据组合中的转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
+msgid "Open an editor for the selected turn restricion"
+msgstr "为选取的转弯限制开启编辑器"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
+msgid "Delete the selected turn restriction"
+msgstr "删除选取的转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:314
+msgid "Create a new turn restriction"
+msgstr "建立新的转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:353
+msgid "Set the current JOSM selection to the selected turn restrictions"
+msgstr "将目前的 JOSM 选择区域设定为选取的转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:355
+msgid "Select in current data layer"
+msgstr "在目前的数据图层中选择"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:386
+msgid "Zoom to the currently selected turn restrictions"
+msgstr "缩放到目前选取的转弯限制"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:57
+msgid ""
+"Development of the turn restriction plugin was sponsored by <a href=\"http://"
+"www.skobbler.de\">skobbler GmbH</a>."
+msgstr ""
+"转弯限制插件的开发是由 <a href=\"http://www.skobbler.de\">skobbler GmbH</a> "
+"赞助。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:96
+msgid "Configure the preferences for the turnrestrictions plugin"
+msgstr "设定 turnrestrictions 插件的偏好设定"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:97
+msgid "Sponsor"
+msgstr "赞助者"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:106
+msgid "An OSM plugin for editing turn restrictions."
+msgstr "用来编辑转弯限制的 OSM 插件"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:50
+msgid ""
+"The Basic Editor can optionally display the list of via-objects of a turn "
+"restriction. If enabled, one can edit them in the Basic editor too. If "
+"disabled, editing of via-objects is possible in the Advanced Editor only."
+msgstr ""
+"基本编辑器可以选择性显示转弯限制的 via-对象清单。如果启用，就可以在基本编辑器"
+"中编辑它们。如果停用，就只能在进阶编辑器中编辑 via-对象。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:60
+msgid "Display and edit list of via-objects in the Basic Editor"
+msgstr "在基本编辑器显示与编辑 via-对象"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:78
+msgid "Road signs - Set A"
+msgstr "交通标志 - A 组"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:107
+msgid "Road signs - Set B"
+msgstr "交通标志 - B 组"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:131
+msgid "Please select the set of road sign icons to be used in the plugin."
+msgstr "请选择要用在插件中的路标图示组。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:188
+#, java-format
+msgid ""
+"Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. "
+"Assuming the default value ''set-a''."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:48
+msgid ""
+"Please configure the <strong>keyboard shortcut</strong> which triggers "
+"creating/editing a turn restriction from the current JOSM selection."
+msgstr ""
+"请设定 <strong>快捷键</strong> 从目前的 JOSM 选择区域触发建立/编辑转弯限制。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:64
+msgctxt "keyboard-key"
+msgid "Key:"
+msgstr "键值："
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:75
+msgctxt "keyboard-modifiers"
+msgid "Modifiers:"
+msgstr "特殊键："
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:78
+msgctxt "keyboard-modifiers"
+msgid "Shift"
+msgstr "Shift"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:80
+msgctxt "keyboard-modifiers"
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:82
+msgctxt "keyboard-modifiers"
+msgid "Alt"
+msgstr "Alt"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:85
+msgctxt "keyboard-modifiers"
+msgid "Meta"
+msgstr "Meta"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:29
+#, java-format
+msgid ""
+"This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
+"span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. In "
+"a turn restriction, the way with role <tt>from</tt> should be different from "
+"the way with role <tt>to</tt>, though."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
+msgid "Delete ''from''"
+msgstr "删除 \"出发\""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:38
+msgid "Removes the member with role ''from''"
+msgstr "删除角色为 \"出发\" 的成员"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:47
+msgid "Delete ''to''"
+msgstr "删除 \"到达\""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:48
+msgid "Removes the member with role ''to''"
+msgstr "删除角色为 \"到达\" 的成员"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:57
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:35
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:59
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:30
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:56
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:33
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:80
+msgid "Fix in editor"
+msgstr "在编辑器中修正"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:58
+msgid ""
+"Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
+msgstr "转到基本编辑器并手动选择角色为 \"出发\" 和 \"到达\" 的成员"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:27
+#, java-format
+msgid ""
+"This turn restriction uses a non-standard restriction type <tt>{0}</tt> for "
+"the tag key <tt>restriction</tt>. It is recommended to use standard values "
+"only. Please select one in the Basic editor."
+msgstr ""
+"这个转弯限制在标签设定键 <tt>restriction</tt> 使用了非标准的限制类型 <tt>{0}"
+"</tt>。只建议使用标准的数值。请在基本编辑器中选择一项。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:36
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:31
+msgid "Go to Basic Editor and manually choose a turn restriction type"
+msgstr "转到基本编辑器并手动选择转弯类型"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:37
+#, java-format
+msgid ""
+"The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the "
+"<strong>to</strong>-way <span class=\"object-name\">{1}</span> interesect at "
+"node <span class=\"object-name\">{2}</span> but <span class=\"object-name\">"
+"{2}</span> isn''t a <strong>via</strong>-object.<br> It is recommended to "
+"set <span class=\"object-name\">{2}</span> as unique <strong>via</strong>-"
+"object."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49
+msgid "Set via-Object"
+msgstr "设定 via-对象"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:50
+msgid ""
+"Replaces the currently configured via-objects with the node at the "
+"intersection"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:60
+msgid "Go to Basic Editor and manually fix the list of via-objects"
+msgstr "转到基本编辑器并手动修正 via-对象清单"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:25
+msgid ""
+"A turn restriction must declare the type of restriction. Please select a "
+"type in the Basic Editor."
+msgstr "转弯限制必须宣告限制的种类。请在基本编辑器中选择一个类型。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36
+msgid "An OSM way with role <tt>from</tt> is required in a turn restriction."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:39
+msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42
+msgid "Please go to the Basic editor and manually choose an OSM way."
+msgstr "请转到基本编辑器并手动选择一条 OSM 道路。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48
+msgid "Add in editor"
+msgstr "在编辑器中加入"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51
+msgid "Add an OSM way with role ''from''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:54
+msgid "Add an OSM way with role ''to''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:37
+#, java-format
+msgid ""
+"A turn restriction requires exactly one way with role <tt>from</tt>. This "
+"turn restriction has {0} ways in this role. Please remove {1} of them."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:44
+#, java-format
+msgid ""
+"A turn restriction requires exactly one way with role <tt>to</tt>. This turn "
+"restriction has {0} ways in this role. Please remove {1} of them."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57
+msgid "Go to the Advanced Editor and remove the members"
+msgstr "转到进阶编辑器并删除成员"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:25
+#, java-format
+msgid ""
+"The tag <tt>except</tt> has the non-standard value <tt>{0}</tt>. It is "
+"recommended to use standard values for <tt>except</tt> only."
+msgstr ""
+"标签 <tt>except</tt> 有非标准的数值 <tt>{0}</tt>。只建议在 <tt>except</tt> 使"
+"用标准的数值。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:34
+msgid "Go to Basic Editor and select standard vehicle type based exceptions"
+msgstr "转到基本编辑器并选择基于标准车辆类型的例外"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:37
+#, java-format
+msgid "The required tag <tt>{0}={1}</tt> is missing."
+msgstr "缺少了必要的标签 <tt>{0}={1}</tt>。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45
+msgid "Add missing tag"
+msgstr "加入缺少的标签"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:46
+#, java-format
+msgid "Add the missing tag {0}={1}"
+msgstr "加入缺少的标签 {0}={1}"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
+#, java-format
+msgid ""
+"The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
+"should be split at node <span class=\"object-name\">{2}</span> where it "
+"connects to way <span class=\"object-name\">{3}</span>."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+msgid "Split now"
+msgstr "立即切割"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
+msgid "Splits the way"
+msgstr "切割这个路径"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:45
+#, java-format
+msgid ""
+"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
+msgstr ""
+"这个转弯限制使用 OSM 节点 <span class=\"object-name\">{0}</span> 作为角色 "
+"<tt>{1}</tt> 的成员。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
+#, java-format
+msgid ""
+"This turn restriction uses the OSM relation <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
+msgstr ""
+"这个转弯限制使用 OSM 关系 <span class=\"object-name\">{0}</span> 作为角色 "
+"<tt>{1}</tt> 的成员。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57
+msgid "An OSM way is required instead."
+msgstr "需要 OSM 路径代替。"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:63
+msgid "Delete the member from the turn restriction"
+msgstr "从转弯限制删除成员"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:81
+msgid "Change to the Basic Editor and select an OSM way"
+msgstr "改变为基本编辑器并选择 OSM 路径"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64
+msgid "Undelete object..."
+msgstr "取消删除对象..."
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:64
+msgid "Undelete object by id"
+msgstr "依 ID 取消删除对象"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:70
+msgid "Select if the data should be added into a new layer"
+msgstr "如果数据要加入到新的图层里请选择此项"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:88
+msgid "Enter the ID of the object that should be undeleted"
+msgstr "输入要取消删除的对象 ID"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:100
+msgid "Undelete Object"
+msgstr "取消删除对象"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:101
+msgid "Undelete object"
+msgstr "取消删除对象"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:106
+msgid "Start undeleting"
+msgstr "开始取消删除"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:107
+msgid "Close dialog and cancel"
+msgstr "关闭对话框并取消"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:162
+#, java-format
+msgid "Will get {0}"
+msgstr "会得到 {0}"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:166
+#, java-format
+msgid "Looking for {0}"
+msgstr "寻找 {0}"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:168
+#, java-format
+msgid "Found {0}"
+msgstr "找到 {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
+msgid "Validation errors"
+msgstr "验证的错误"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
+msgid "No validation errors"
+msgstr "没有验证上的错误"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:174
+msgid "Grid"
+msgstr "格线"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282
+#, java-format
+msgid ""
+"Error initializing test {0}:\n"
+" {1}"
+msgstr ""
+"初始化测试 {0} 错误：\n"
+" {1}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
+msgid "Use ignore list."
+msgstr "使用忽略清单。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:75
+msgid "Use the ignore list to suppress warnings."
+msgstr "使用忽略清单来抑制警告。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
+msgid "Use error layer."
+msgstr "使用错误图层。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:79
+msgid "Use the error layer to display problematic elements."
+msgstr "使用错误图层来显示有问题的元件。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
+msgid "Show informational level on upload."
+msgstr "上传时显示信息层级。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:83
+msgid "Show the informational tests in the upload check windows."
+msgstr "在上传检查视窗中显示信息测试。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
+msgid "On demand"
+msgstr "下指令时"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:89
+msgid "On upload"
+msgstr "上传时"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
+msgid ""
+"An OSM data validator that checks for common errors made by users and editor "
+"programs."
+msgstr "OSM 数据检验器，能够检查使用者与编辑器程序造成的一般性错误。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:101
+msgid "Data validator"
+msgstr "数据检验器"
+
+#. * Error messages
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:14
+msgid "Errors"
+msgstr "错误"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:14
+msgid "validation error"
+msgstr "验证的错误"
+
+#. * Warning messages
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:16
+msgid "Warnings"
+msgstr "警告"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:16
+msgid "validation warning"
+msgstr "验证警告"
+
+#. * Other messages
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110
+msgid "Other"
+msgstr "其他"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18
+msgid "validation other"
+msgstr "验证其他的"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:102
+#, java-format
+msgid "Running test {0}"
+msgstr "执行测试 {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
+msgid "Validation"
+msgstr "验证"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+msgid "Performs the data validation"
+msgstr "进行数据验证"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr "正在验证..."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr "测试 {0}/{1}：正在开始 {2}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr "正在更新跳过的错误 ..."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
+msgid "Data with errors. Upload anyway?"
+msgstr "数据有错误。要强制上传吗?"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
+msgid "Open the validation window."
+msgstr "开启验证视窗。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:92
+msgid "Zoom to problem"
+msgstr "缩放至问题点"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:113
+msgid "Fix"
+msgstr "修正"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:113
+msgid "Fix the selected errors."
+msgstr "修正选取的错误。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:118
+msgid "Ignore the selected errors next time."
+msgstr "下次忽略选取的错误。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199
+msgid "Whole group"
+msgstr "整个群组"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199
+msgid "Single elements"
+msgstr "单一元件"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199
+msgid "Nothing"
+msgstr "不做任何事"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:200
+msgid "Ignore whole group or individual elements?"
+msgstr "忽略整个群组或是个别元件?"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:201
+msgid "Ignoring elements"
+msgstr "正在跳过元件"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:468
+msgid "Fixing errors ..."
+msgstr "正在修正错误 ..."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:491
+#, java-format
+msgid "Fixing ({0}/{1}): ''{2}''"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:507
+msgid "Updating map ..."
+msgstr "正在更新地图 ..."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:72
+#, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr "将 \"{1}\" 取代为 \"{0}\""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "对象"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
+msgid "Coastlines."
+msgstr "海岸线。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:43
+msgid "This test checks that coastlines are correct."
+msgstr "这会测试海岸线是否正确。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:121
+msgid "Unconnected coastline"
+msgstr "未连接的海岸线"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:151
+msgid "Unordered coastline"
+msgstr "未排序的海岸线"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:155
+msgid "Reversed coastline"
+msgstr "反方向的海岸线"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
+msgid "Crossing ways."
+msgstr "路径交叉。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:48
+msgid ""
+"This test checks if two roads, railways, waterways or buildings crosses in "
+"the same layer, but are not connected by a node."
+msgstr ""
+"这会测试是否有两条道路、铁路、水路或建筑物在同一图层交错，但没有以节点连接。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:126
+msgid "Crossing buildings"
+msgstr "交错的建筑物"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:126
+msgid "Crossing ways"
+msgstr "路径交叉"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:174
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:185
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:196
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:207
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:218
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:229
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:239
+msgid "Duplicated nodes"
+msgstr "重复的节点"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:90
+msgid "This test checks that there are no nodes at the very same location."
+msgstr "这会测试有没有位置非常相近的节点存在。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
+msgid "Mixed type duplicated nodes"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
+msgid "Highway duplicated nodes"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
+msgid "Railway duplicated nodes"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
+msgid "Waterway duplicated nodes"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
+msgid "Boundary duplicated nodes"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
+msgid "Power duplicated nodes"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
+msgid "Nodes at same position"
+msgstr "节点在同一个地点"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:84
+msgid "Duplicated ways"
+msgstr "重复的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:65
+msgid ""
+"This test checks that there are no ways with same tags and same node "
+"coordinates."
+msgstr "这个测试会检查有无同样标签及节点坐标的路径。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:169
+msgid "Delete duplicate ways"
+msgstr "删除重复的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23
+msgid "Duplicated way nodes."
+msgstr "重复的路径节点。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:24
+msgid "Checks for ways with identical consecutive nodes."
+msgstr "检查是否有整个节点都相同的路径。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:37
+msgid "Duplicated way nodes"
+msgstr "重复的路径节点"
+
+#. group "Relations"
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
+#: build/trans_presets.java:3213
+msgid "Multipolygon"
+msgstr "多重多边形"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:50
+msgid "This test checks if multipolygons are valid"
+msgstr "这个测试会检查多重多边形是否有效"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:120
+msgid "Area style way is not closed"
+msgstr "区域类型的路径并未封闭"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:134
+msgid "No outer way for multipolygon"
+msgstr "多重多边形没有外部路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:151
+msgid "No style in multipolygon relation"
+msgstr "在多重多边形关系中没有样式"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:169
+msgid "Style for inner way equals multipolygon"
+msgstr "内部路径的样式等同多重多边形"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:180
+msgid "Style for outer way mismatches"
+msgstr "外部路径的样式不符"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:186
+msgid "No style for multipolygon"
+msgstr "多重多边形中没有样式"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:191
+msgid "Multipolygon is not closed"
+msgstr "多重多边形并未封闭"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:213
+msgid "Multipolygon inner way is outside"
+msgstr "多重多边形的内部路径超出外围"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:216
+msgid "Intersection between multipolygon ways"
+msgstr "多重多边形之间有交集"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:227
+msgid "No useful role for multipolygon member"
+msgstr "多重多边形成员没有有用的角色"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:230
+msgid "Non-Way in multipolygon"
+msgstr "多重多边形内没有路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
+msgid "Missing name:* translation."
+msgstr "缺少 name:* 翻译。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:37
+msgid ""
+"This test finds multilingual objects whose 'name' attribute is not equal to "
+"some 'name:*' attribute and not a composition of 'name:*' attributes, e.g., "
+"Italia - Italien - Italy."
+msgstr ""
+"这个测试会检查多语系对象的 \"name\" 属性不会等同于某些 \"name:*\" 属性，并且"
+"也不是由 \"name:*\" 属性组成。例如：Italia - Italien - Italy。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:47
+msgid "A name:* translation is missing."
+msgstr "缺少 name:* 翻译。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:74
+msgid "A name is missing, even though name:* exists."
+msgstr "缺少 name，虽然还有 name:* 存在。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:25
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:63
+msgid "Nodes with same name"
+msgstr "有同样名称的节点"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:26
+msgid "This test finds nodes that have the same name (might be duplicates)."
+msgstr "这个测试会找出有相同名称的节点(可能是重复的节点)。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
+msgid "Overlapping ways."
+msgstr "重叠的路径。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:45
+msgid ""
+"This test checks that a connection between two nodes is not used by more "
+"than one way."
+msgstr "这个测试会检查两个节点间的连结是否被用于一条以上的路径。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:108
+msgid "Overlapping areas"
+msgstr "重叠的区域"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:113
+msgid "Overlapping highways (with area)"
+msgstr "重叠的公路(含区域)"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:118
+msgid "Overlapping railways (with area)"
+msgstr "重叠的铁路(含区域)"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:123
+msgid "Overlapping ways (with area)"
+msgstr "重叠的路径(含区域)"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:129
+msgid "Overlapping highways"
+msgstr "重叠的公路"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:134
+msgid "Overlapping railways"
+msgstr "重叠的铁路"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:139
+msgid "Overlapping ways"
+msgstr "重叠的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:41
+msgid "Relation checker :"
+msgstr "关系检查程序："
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:42
+msgid "This plugin checks for errors in relations."
+msgstr "这个插件会检查在关系中的错误。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:112
+msgid "Relation type is unknown"
+msgstr "关系类型不明"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:142
+msgid "Relation is empty"
+msgstr "关系是空白的"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:152
+msgid "<empty>"
+msgstr "<空白>"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:160
+#, java-format
+msgid "Role {0} missing"
+msgstr "缺少角色 {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:161
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:167
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:173
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:181
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:198
+msgid "Role verification problem"
+msgstr "角色验证问题"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:166
+#, java-format
+msgid "Number of {0} roles too low ({1})"
+msgstr "{0} 角色的编号太低 ({1})"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:172
+#, java-format
+msgid "Number of {0} roles too high ({1})"
+msgstr "{0} 角色的编号太高 ({1})"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:180
+#, java-format
+msgid "Member for role {0} of wrong type"
+msgstr "角色 {0} 成员的类型错误"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:191
+#, java-format
+msgid "Role {0} unknown"
+msgstr "不明的角色 {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:197
+msgid "Empty role found"
+msgstr "发现空白角色"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:34
+msgid "Self-intersecting ways"
+msgstr "自我交叉的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:23
+msgid ""
+"This test checks for ways that contain some of their nodes more than once."
+msgstr "这个测试会检查路径是否包含自己部分节点超过一次。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:87
+msgid "Similarly named ways"
+msgstr "名称近似的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:40
+msgid ""
+"This test checks for ways with similar names that may have been misspelled."
+msgstr "这个测试会检查名称近似的路径，因为那有可能是拼错字了。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153
+msgid "Properties checker :"
+msgstr "属性检查器："
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:154
+msgid "This plugin checks for errors in property keys and values."
+msgstr "这个插件会检查属性中的设定键和数值有无错误。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:286
+#, java-format
+msgid "Invalid tagchecker line - {0}: {1}"
+msgstr "无效的标签检查行- {0}： {1}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:299
+#, java-format
+msgid "Invalid spellcheck line: {0}"
+msgstr "无效的拼写检查行：{0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:310
+#, java-format
+msgid ""
+"Could not access data file(s):\n"
+"{0}"
+msgstr ""
+"无法存取数据文件：\n"
+"{0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:458
+msgid "Illegal tag/value combinations"
+msgstr "不合法的标签/数值组合"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
+#, java-format
+msgid "Key ''{0}'' invalid."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+msgid "Tag value contains character with code less than 0x20"
+msgstr "标签数值包含字码少于 0x20 的字节"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+msgid "Tag key contains character with code less than 0x20"
+msgstr "标签设定键包含字码少于 0x20 的字节"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+msgid "Tag value longer than allowed"
+msgstr "标签数值长过允许值"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:491
+msgid "Tag key longer than allowed"
+msgstr "标签设定键长过允许值"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:497
+msgid "Tags with empty values"
+msgstr "标签没有数值"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:503
+msgid "Invalid property key"
+msgstr "无效的属性设定键"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509
+msgid "Invalid white space in property key"
+msgstr "属性设定键中有无效的空白字节"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:515
+msgid "Property values start or end with white space"
+msgstr "属性数值以空白字节开头或结尾"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+msgid "Property values contain HTML entity"
+msgstr "属性数值含有 HTML 标记"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
+#, java-format
+msgid "Key ''{0}'' not in presets."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549
+msgid "Presets do not contain property key"
+msgstr "预设组合不包含属性设定键"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:571
+#, java-format
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:572
+msgid "Presets do not contain property value"
+msgstr "预设组合不包含属性数值"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
+msgid "FIXMES"
+msgstr "FIXMES"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627
+msgid "Check property keys."
+msgstr "检查属性设定键。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+msgid "Validate that property keys are valid checking against list of words."
+msgstr "检查文字清单以验证属性设定键是有效的。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
+msgid "Use complex property checker."
+msgstr "使用复杂的属性检查器。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+msgid "Validate property values and tags using complex rules."
+msgstr "使用复杂的规则验证属性数值。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:658
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:680
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+msgid "TagChecker source"
+msgstr "标签检查器来源"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
+msgid ""
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+"拼写检查或标签检查数据文件的来源(URL 或文件名称)(请查阅 http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller)"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+msgid "Add a new source to the list."
+msgstr "将新的来源加入清单。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+msgid "Edit the selected source."
+msgstr "编辑选取的来源。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:723
+msgid "Delete the selected source from the list."
+msgstr "从清单删除选取的来源。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
+msgid "Data sources"
+msgstr "数据来源"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+msgid "Check property values."
+msgstr "检查属性数值。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+msgid "Validate that property values are valid checking against presets."
+msgstr "验证属性数值合于预设组合的要求。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+msgid "Check for FIXMES."
+msgstr "检查 FIXMES。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+msgid "Looks for nodes or ways with FIXME in any property value."
+msgstr "寻找在任何属性数值中含有 FIXME 的节点或路径。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:761
+msgid "Use default data file."
+msgstr "使用预设的数据文件。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:762
+msgid "Use the default data file (recommended)."
+msgstr "使用预设的数据文件(建议值)。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765
+msgid "Use default tag ignore file."
+msgstr "使用预设标签忽略文件。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:766
+msgid "Use the default tag ignore file (recommended)."
+msgstr "使用预设标签忽略文件(建议值)。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:769
+msgid "Use default spellcheck file."
+msgstr "使用预设的拼写检查文件。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:770
+msgid "Use the default spellcheck file (recommended)."
+msgstr "使用预设的拼写检查文件(建议值)。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:862
+msgid "Fix properties"
+msgstr "修正属性"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977
+msgid "Could not find element type"
+msgstr "找不到元件类型"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:979
+msgid "Incorrect number of parameters"
+msgstr "参数有不正确的数字"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:997
+msgid "Could not find warning level"
+msgstr "找不到警告等级"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1006
+#, java-format
+msgid "Illegal expression ''{0}''"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1010
+#, java-format
+msgid "Illegal regular expression ''{0}''"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:35
+msgid "Turnrestriction"
+msgstr "Turnrestriction"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:36
+msgid "This test checks if turnrestrictions are valid"
+msgstr "这个测试会检查转弯限制是否有效"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:103
+msgid "Unknown role"
+msgstr "不明的角色"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:107
+msgid "Unknown member type"
+msgstr "不明成员类型"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:113
+msgid "More than one \"from\" way found"
+msgstr "找到一个以上 \"出发\" 路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:115
+msgid "More than one \"to\" way found"
+msgstr "找到一个以上 \"到达\" 路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:117
+msgid "More than one \"via\" way found"
+msgstr "找到一个以上 \"经过\" 路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:120
+msgid "No \"from\" way found"
+msgstr "找不到 \"出发\" 路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:124
+msgid "No \"to\" way found"
+msgstr "找不到 \"到达\" 路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:128
+msgid "No \"via\" node or way found"
+msgstr "找不到 \"经过\" 节点或路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:138
+msgid "The \"from\" way does not start or end at a \"via\" node"
+msgstr "\"出发\" 路径没有开始或结束于 \"经过\" 节点"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:143
+msgid "The \"to\" way does not start or end at a \"via\" node"
+msgstr "\"到达\" 路径没有开始或结束于 \"经过\" 节点"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:176
+msgid "The \"from\" way does not start or end at a \"via\" way."
+msgstr "\"出发\" 路径没有开始或结束于 \"经过\" 路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:181
+msgid "The \"to\" way does not start or end at a \"via\" way."
+msgstr "\"到达\" 路径没有开始或结束于 \"经过\" 路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:35
+msgid "Unclosed Ways."
+msgstr "未关闭的路径。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:35
+msgid "This tests if ways which should be circular are closed."
+msgstr "这会测试圆形的路径是否已封闭。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:77
+#, java-format
+msgid "natural type {0}"
+msgstr "自然的类型 {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:80
+#, java-format
+msgid "landuse type {0}"
+msgstr "土地利用的类型 {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:83
+#, java-format
+msgid "amenities type {0}"
+msgstr "便利设施类型 {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:86
+#, java-format
+msgid "sport type {0}"
+msgstr "运动设施类型 {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:89
+#, java-format
+msgid "tourism type {0}"
+msgstr "旅游设施类型 {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:92
+#, java-format
+msgid "shop type {0}"
+msgstr "商店类型 {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:95
+#, java-format
+msgid "leisure type {0}"
+msgstr "空闲类型 {0}"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:98
+#, java-format
+msgid "waterway type {0}"
+msgstr "水路类型 {0}"
+
+#. color building
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="area" b="yes"/>
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
+#: build/trans_style.java:4364
+msgid "area"
+msgstr "区域"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:123
+msgid "Unclosed way"
+msgstr "未封闭的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
+msgid "Unconnected ways."
+msgstr "未连接的路径。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:62
+msgid "This test checks if a way has an endpoint very near to another way."
+msgstr "这个测试会检查路径的结束点是否非常靠近其他的路径。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:127
+msgid "Way end node near other highway"
+msgstr "路径结束点靠近其他的公路"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:147
+msgid "Way end node near other way"
+msgstr "路径结束点靠近其他的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:168
+msgid "Way node near other way"
+msgstr "路径节点靠近其他的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:186
+msgid "Connected way end node near other way"
+msgstr "已连接的路径结束点靠近其他的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:43
+msgid "Untagged and unconnected nodes"
+msgstr "未加标签与未连接的节点"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:44
+msgid "This test checks for untagged nodes that are not part of any way."
+msgstr "这个测试会检查未加标签且不属任何路径的一部分的节点。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68
+msgid "No tags"
+msgstr ""
+
+#. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109
+msgid "Unconnected nodes without physical tags"
+msgstr ""
+
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77
+msgid "Has tag containing ''fixme'' or ''FIXME''"
+msgstr ""
+
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87
+msgid "Has key ''note'' or ''comment'' or ''description''"
+msgstr ""
+
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91
+msgid "Has key ''created_by'' or ''converted_by''"
+msgstr ""
+
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95
+msgid "Has key ''watch''"
+msgstr ""
+
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99
+msgid "Has key ''source''"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:62
+msgid "Untagged, empty and one node ways."
+msgstr "未加标签、空的和仅一个节点的路径。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:63
+msgid "This test checks for untagged, empty and one node ways."
+msgstr "这个测试会检查未加标签、空的和仅一个节点的路径。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+msgid "Unnamed ways"
+msgstr "未命名的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:96
+msgid "Unnamed junction"
+msgstr "未命名的汇集点"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
+msgid "Untagged ways (commented)"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
+msgid "Untagged ways"
+msgstr "未加标签的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:111
+msgid "Empty ways"
+msgstr "空的路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:115
+msgid "One node ways"
+msgstr "单一节点路径"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
+msgid "Wrongly Ordered Ways."
+msgstr "排序错误的路径。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:36
+msgid "This test checks the direction of water, land and coastline ways."
+msgstr "这个测试会检查水域、陆地和海岸线路径的方向。"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:70
+msgid "Reversed coastline: land not on left side"
+msgstr "反转的海岸线：陆地不在左侧"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:75
+msgid "Reversed water: land not on left side"
+msgstr "反转的水域：陆地不在左侧"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:80
+msgid "Reversed land: land not on left side"
+msgstr "反转的陆地：陆地不在左侧"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75
+#, java-format
+msgid "{0}, ..."
+msgstr "{0}, ..."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
+#, java-format
+msgid "{0} {1}% of GPS track"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:88
+msgid "Shows current position in the video"
+msgstr "显示目前在影片中的位置"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113
+msgid "Import Video"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113
+msgid "Sync a video against this GPS track"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+msgid "Remove Video"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
+msgid "removes current video from layer"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+msgid "play/pause"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
+msgid "starts/pauses video playback"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+msgid "backward"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
+msgid "jumps n sec back"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+msgid "forward"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
+msgid "jumps n sec forward"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+msgid "faster"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
+msgid "faster playback"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175
+msgid "slower"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175
+msgid "slower playback"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:102
+msgid "loop"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183
+msgid "loops n sec around current position"
+msgstr ""
+
+#. now the options menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:193
+msgid "Keep centered"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:193
+msgid "follows the video icon automaticly"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:207
+msgid "Jump length"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
+msgid "Set the length of a jump"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:207
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:218
+msgid "Jump in video for x ms"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:214
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:218
+msgid "Loop length"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:214
+msgid "Set the length around a looppoint"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:227
+msgid "no deinterlacing"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:235
+msgid "deinterlacing using line doubling"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
+msgid "deinterlacing using linear interpolation"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
+msgid "play"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
+msgid "Unable to find JNA Java library!"
+msgstr ""
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:135
+msgid "Unable to find native libvlc library!"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
+msgid "Scanned Map..."
+msgstr "扫描的地图..."
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
+msgid ""
+"Display a map that was previously scanned and uploaded to walking-papers.org"
+msgstr "显示先前扫描并上传到 walking-papers.org 的地图"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
+msgid ""
+"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
+msgstr "输入 walking-papers.org URL 或 ID (在 URL 中  ?id= 之后的部分)"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70
+#, java-format
+msgid "Could not read information from walking-papers.org the id \"{0}\""
+msgstr "无法从 walking-papers.org 读取 id \"{0}\" 的信息"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
+#, java-format
+msgid "Walking Papers: {0}"
+msgstr "Walking Papers：{0}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
+#, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "Walking Papers 图层 ({0})，于缩放 {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:30
+msgid "Walking Papers"
+msgstr "Walking Papers"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:56
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:59
+msgid "Way Download"
+msgstr "路径下载"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58
+msgid "Download map data on the end of selected way"
+msgstr "下载地图数据于选取的路径结尾"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:100
+msgid ""
+"<html>Neither a node nor a way with an endpoint outside of the<br>current "
+"download areas is selected.<br>Select a node on the start or end of a way or "
+"an entire way first.</html>"
+msgstr ""
+"<html>有被选取的节点或路径的结束点<br>在目前的下载区域外。<br>请先选取路径的"
+"开头或结尾节点或整条路径。</html>"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:107
+msgid "<html>Could not find a unique node to start downloading from.</html>"
+msgstr "<html>找不到能开始下载的唯一节点。</html>"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:119
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:169
+#, java-format
+msgid ""
+"Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t "
+"discovered after download"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:183
+#, java-format
+msgid ""
+"<html>There aren''t further connected ways to download.<br>A potential "
+"duplicate node of the currently selected node was found, though.<br><br>The "
+"currently selected node is ''{0}''<br>The potential duplicate node is "
+"''{1}''<br>Merge the duplicate node onto the currently selected node and "
+"continue way downloading?</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:196
+msgid "Merge duplicate node?"
+msgstr "是否合并重复的节点?"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:213
+msgid "<html>No more connected ways to download.</html>"
+msgstr "<html>没有其他连接的路径要下载。</html>"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:222
+#, java-format
+msgid "Node ''{0}'' is a junction with more than 2 connected ways."
+msgstr ""
+
+#: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:44
+#: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:47
+msgid "Way Select"
+msgstr "路径选择"
+
+#: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:46
+msgid "Select non-branching sequences of ways"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+msgid "Exception occurred"
+msgstr "发生例外"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+msgid "Not in cache"
+msgstr "不在缓存中"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71
+msgid "Rectified Image..."
+msgstr "修正的图片..."
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69
+msgid "Download Rectified Images From Various Services"
+msgstr "从多种服务下载修正的图片"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71
+#, java-format
+msgid "WMS: {0}"
+msgstr "WMS：{0}"
+
+#. This service serves the purpose of "just this once" without forcing the user
+#. to commit the link to the preferences
+#. Clipboard content gets trimmed, so matching whitespace only ensures that this
+#. service will never be selected automatically.
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107
+msgid "Custom WMS Link"
+msgstr "自定义 WMS 连结"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112
+msgid "Supported Rectifier Services:"
+msgstr "支持的修正器服务："
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136
+msgid "Visit Homepage"
+msgstr "参观首页"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145
+msgid "WMS URL or Image ID:"
+msgstr "WMS URL 或图片 ID："
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+msgid "Add Rectified Image"
+msgstr "加入修正的图片"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201
+msgid ""
+"Couldn't match the entered link or id to the selected service. Please try "
+"again."
+msgstr "无法将整个连结或 id 与选取的服务进行比对。请再试一次。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:202
+msgid "No valid WMS URL or id"
+msgstr "没有有效的 WMS URL 或 id"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
+msgid "Adjust the position of the selected WMS layer"
+msgstr "调整选取的 WMS 图层的位置"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+msgid "Please select the WMS layer to adjust."
+msgstr "请选择要调整的 WMS 图层。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+msgid "Select WMS layer"
+msgstr "选择 WMS 图层"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Start adjusting"
+msgstr "开始调整"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+msgid "There are currently no WMS layer to adjust."
+msgstr "目前没有 WMS 图层要调整。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+msgid "No layers to adjust"
+msgstr "没有要调整的图层"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15
+#, java-format
+msgid "Download WMS tile from {0}"
+msgstr "从 {0} 下载 WMS 拼贴"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#, java-format
+msgid ""
+"Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' "
+"or a trailing '?'."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+msgid ""
+"Warning: Fetching WMS tiles is likely to fail. Please check you preference "
+"settings."
+msgstr "警告：取回 WMS 拼贴似乎失败了。请检查您的偏好设定值。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#, java-format
+msgid "Warning: The complete URL is ''{0}''."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#, java-format
+msgid ""
+"The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
+"This may lead to wrong coordinates."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
+#, java-format
+msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+msgid "(deactivated)"
+msgstr "(不使用)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
+#, java-format
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
+msgstr "WMS 图层 ({0})，于缩放 {1} 自动下载"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#, java-format
+msgid "WMS layer ({0}), downloading in zoom {1}"
+msgstr "WMS 图层 ({0})，于缩放 {1} 下载"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
+#, java-format
+msgid ""
+"<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with a "
+"''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS request. "
+"You should check your<br>preference settings.<br>Do you want to fetch WMS "
+"tiles anyway?"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
+msgid "Yes, fetch images"
+msgstr "是，抓取图片"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
+msgid "Invalid URL?"
+msgstr "无效的 URL?"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+msgid "Download visible tiles"
+msgstr "下载可见的拼贴"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr "要求的区域太大。请拉近一点，或是改变解析度"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+msgid "Change resolution"
+msgstr "改变解析度"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
+msgid "Reload erroneous tiles"
+msgstr "重新载入错误的拼贴"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
+msgid "Alpha channel"
+msgstr "透明色版"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
+msgid "Save WMS layer to file"
+msgstr "将 WMS 图层保存为文件"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
+msgid "Save WMS layer"
+msgstr "保存 WMS 图层"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
+msgid "Load WMS layer from file"
+msgstr "从文件载入 WMS 图层"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
+msgid "Load WMS layer"
+msgstr "载入 WMS 图层"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#, java-format
+msgid "Unsupported WMS file version; found {0}, expected {1}"
+msgstr "不支持的 WMS 文件版本；发现 {0}，应为 {1}"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+msgid "File Format Error"
+msgstr "文件格式错误"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
+msgid "Error loading file"
+msgstr "载入文件有错误"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
+msgid "Set WMS Bookmark"
+msgstr "设定 WMS 书签"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "自动下载"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
+msgid "WMS"
+msgstr "WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
+msgid "Open a blank WMS layer to load data from a file"
+msgstr "开啓空白 WMS 图层以便自文件载入数据"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+msgid "WMS Plugin Preferences"
+msgstr "WMS 插件偏好设定"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr "修改在 WMS 插件菜单中显示的 WMS 服务器清单"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:79
+msgid "Menu Name"
+msgstr "菜单名称"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:83
+msgid "WMS URL"
+msgstr "WMS URL"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+msgid "Menu Name (Default)"
+msgstr "菜单名称(预设值)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
+msgid "WMS URL (Default)"
+msgstr "WMS URL(预设值)"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
+msgid "Enter a menu name and WMS URL"
+msgstr "输入菜单名称和 WMS URL"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
+msgid "Copy Selected Default(s)"
+msgstr "复制已选取的预设值"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
+msgid "Please select at least one row to copy."
+msgstr "请选择至少一列来复制。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
+msgid "Downloader:"
+msgstr "下载器："
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:169
+msgid "Overlap tiles"
+msgstr "重叠拼贴"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:170
+msgid "% of east:"
+msgstr "% 东："
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "% of north:"
+msgstr "% 北："
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
+msgid "Simultaneous connections"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
+#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
+msgid "WMS Files (*.wms)"
+msgstr "WMS 文件 (*.wms)"
+
+#. *
+#. This file can be used to add some special messages to the translation,
+#. which are not part of the programm texts, but should be translated nevertheless.
+#.
+#. The text before is for translators
+#.
+#. OSM server message
+#: build/specialmessages.java:8
+msgid ""
+"You requested too many nodes (limit is 50,000). Either request a smaller "
+"area, or use planet.osm"
+msgstr "您要求太多节点(限制为 50,000)。请使用更小的区域，或改用 planet.osm"
+
+#. OSM server message
+#: build/specialmessages.java:9
+msgid "Database offline for maintenance"
+msgstr "数据库离线维护中"
+
+#. OSM server message
+#: build/specialmessages.java:10
+msgid ""
+"The maximum bbox size is 0.25, and your request was too large. Either "
+"request a smaller area, or use planet.osm"
+msgstr ""
+"最大的 bbox 大小为 0.25，而您的要求太大了。请使用更小的区域，或改用 planet."
+"osm"
+
+#. Java message loading audio data
+#: build/specialmessages.java:11
+msgid "could not get audio input stream from input URL"
+msgstr "无法从输入的 URL 取得音效输入串流"
+
+#. Java message loading audio data
+#: build/specialmessages.java:12
+msgid "Audio Device Unavailable"
+msgstr "音效装置无法使用"
+
+#. OSM server message
+#: build/specialmessages.java:13
+msgid "You must make your edits public to upload new data"
+msgstr "您必须将自己的编辑设为公开才能上传新的数据"
+
+#. Nominatim search place type
+#: build/specialmessages.java:14
+msgid "town"
+msgstr "乡镇"
+
+#. Landuse type used in multipolygons
+#. color basin
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="forest"/>
+#: build/specialmessages.java:15 build/trans_style.java:3269
+msgid "forest"
+msgstr "森林"
+
+#. Landuse type used in multipolygons
+#: build/specialmessages.java:16
+msgid "farmland"
+msgstr "农田"
+
+#. relation type
+#: build/specialmessages.java:17
+msgctxt "Relation type"
+msgid "associatedStreet"
+msgstr ""
+
+#. relation type
+#: build/specialmessages.java:18
+msgctxt "Relation type"
+msgid "boundary"
+msgstr ""
+
+#. relation type
+#: build/specialmessages.java:19
+msgctxt "Relation type"
+msgid "enforcement"
+msgstr ""
+
+#. relation type
+#: build/specialmessages.java:20
+msgctxt "Relation type"
+msgid "line"
+msgstr ""
+
+#. relation type
+#: build/specialmessages.java:21
+msgctxt "Relation type"
+msgid "multipolygon"
+msgstr ""
+
+#. relation type
+#: build/specialmessages.java:22
+msgctxt "Relation type"
+msgid "network"
+msgstr ""
+
+#. relation type
+#: build/specialmessages.java:23
+msgctxt "Relation type"
+msgid "public_transport"
+msgstr ""
+
+#. relation type
+#: build/specialmessages.java:24
+msgctxt "Relation type"
+msgid "restriction"
+msgstr ""
+
+#. relation type
+#: build/specialmessages.java:25
+msgctxt "Relation type"
+msgid "route"
+msgstr ""
+
+#. relation type
+#: build/specialmessages.java:26
+msgctxt "Relation type"
+msgid "site"
+msgstr ""
+
+#. relation type
+#: build/specialmessages.java:27
+msgctxt "Relation type"
+msgid "waterway"
+msgstr ""
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:29
+msgid "All Files"
+msgstr "所有文件"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:30
+msgid "Attributes"
+msgstr "属性"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:31
+msgid "Abort file chooser dialog"
+msgstr "中止文件选择对话框"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:32
+msgid "Abort file chooser dialog."
+msgstr "中止文件选择对话框。"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:34
+msgid "Create New Folder"
+msgstr "建立新的文件夹"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:35
+msgid "Delete File"
+msgstr "删除文件"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:37
+msgid "Enter file name:"
+msgstr "请输入文件名称："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:38
+msgid "Enter path or folder name:"
+msgstr "输入路径或文件夹名称："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:39
+msgid "Error "
+msgstr "错误 "
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:40
+#, java-format
+msgid "Error renaming file \"{0}\" to \"{1}\""
+msgstr "更改文件名称 \"{0}\" 为 \"{1}\" 时发生错误"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:41
+msgid "File name:"
+msgstr "文件名称："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:42
+msgid "File Name:"
+msgstr "文件名称："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:43
+msgid "FileChooser help."
+msgstr "FileChooser 帮助。"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:44
+msgid "Files"
+msgstr "文件"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:45
+msgid "Files of type:"
+msgstr "文件类型："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:46
+msgid "Files of Type:"
+msgstr "文件类型："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:48
+msgid "Filter:"
+msgstr "过滤条件："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:49
+msgid "Folders"
+msgstr "文件夹"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:51
+msgid "Home"
+msgstr "家目录"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:52
+msgid "List"
+msgstr "清单"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:53
+msgid "Look in:"
+msgstr "寻找于："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:54
+msgid "Look In:"
+msgstr "寻找于："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:55
+msgid "Modified"
+msgstr "已修改"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:56
+msgid "New Folder"
+msgstr "新增文件夹"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:60
+msgid "Open selected file"
+msgstr "开启选定的文件"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:61
+msgid "Open selected file."
+msgstr "开启选定的文件。"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:63
+msgid "Rename File"
+msgstr "更改文件名称"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:64
+#, java-format
+msgid "Rename file \"{0}\" to"
+msgstr "将文件 \"{0}\" 的名称更改为"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:66
+msgid "Save in:"
+msgstr "保存于："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:67
+msgid "Save In:"
+msgstr "保存于："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:68
+msgid "Save selected file."
+msgstr "保存选取的文件。"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:69
+msgid "Selection:"
+msgstr "选择区域："
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:70
+msgid "Size"
+msgstr "容量"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:73
+msgid "Up One Level"
+msgstr "往上一层"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:74
+msgid "Update"
+msgstr "更新"
+
+#. Strings in JFileChooser
+#: build/specialmessages.java:75
+msgid "Update directory listing."
+msgstr "更新目录清单。"
+
+#. Strings in GTK ColorChooser
+#: build/specialmessages.java:78
+msgid "Blue:"
+msgstr "蓝："
+
+#. Strings in GTK ColorChooser
+#: build/specialmessages.java:79
+msgid "Color Name:"
+msgstr "颜色名称："
+
+#. Strings in GTK ColorChooser
+#: build/specialmessages.java:80
+msgid "Green:"
+msgstr "绿："
+
+#. Strings in GTK ColorChooser
+#: build/specialmessages.java:81
+msgid "Hue:"
+msgstr "色相："
+
+#. Strings in GTK ColorChooser
+#: build/specialmessages.java:82
+msgid "GTK Color Chooser"
+msgstr "GTK 颜色选择器"
+
+#. Strings in GTK ColorChooser
+#: build/specialmessages.java:83
+msgid "Red:"
+msgstr "红："
+
+#. Strings in GTK ColorChooser
+#: build/specialmessages.java:84
+msgid "Saturation:"
+msgstr "彩度："
+
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid ""
+"Group common Address Interpolation inputs in a single dialog, as well as an "
+"option to automatically generate individual house number nodes from a Way."
+msgstr ""
+
+#. File ../plugins/alignways/build.xml had no data
+#. Plugin buildings_tools
+#: build/trans_plugins.java:6
+msgid "Tools for drawing buildings."
+msgstr "绘制建筑物的工具。"
+
+#. Plugin cadastre-fr
+#: build/trans_plugins.java:8
+msgid "A special handler for the French land registry WMS server."
+msgstr "用于法国土地登记 WMS 服务器的特别处理程序。"
+
+#. Plugin colorscheme
+#: build/trans_plugins.java:10
+msgid ""
+"Allows the user to create different color schemes and to switch between "
+"them. Just change the colors and create a new scheme. Used to switch to a "
+"white background with matching colors for better visibility in bright "
+"sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but "
+"true :-)"
+msgstr ""
+"允许使用者建立不同的颜色配置并在它们之间切换。只要改变颜色并建立新的配置即"
+"可。可用来切换为白色背景以便在明亮的阳光下有较佳的视觉感受。请查阅 JOSM 偏好"
+"设定中的对话框与\"地图设定值\" (有点怪但确是真的 :-)"
+
+#. Plugin Create_grid_of_ways
+#: build/trans_plugins.java:12
+msgid "Create a grid of ways."
+msgstr "建立路径的格线。"
+
+#. Plugin czechaddress
+#: build/trans_plugins.java:14
+msgid ""
+"Creating and handling address nodes and buildings within Czech Republic."
+msgstr "建立并处理捷克共和国中的地址节点与建筑。"
+
+#. Plugin dataimport
+#: build/trans_plugins.java:16
+msgid "Allows to import various file formats into JOSM directly."
+msgstr "允许直接将多种文件格式输入 JOSM。"
+
+#. Plugin DirectUpload
+#: build/trans_plugins.java:18
+msgid ""
+"This plugin directly upload GPS Traces from current active layer in JOSM to "
+"openstreetmap.org."
+msgstr ""
+"这个插件可以将 JOSM 中目前使用的图层 GPS 轨迹直接上传至 openstreetmap.org。"
+
+#. Plugin download_along
+#: build/trans_plugins.java:20
+msgid "Downloads OSM data along a way"
+msgstr ""
+
+#. Plugin Duplicate-Way
+#: build/trans_plugins.java:22
+msgid "Duplicate Ways with an offset"
+msgstr "重制路径并位移"
+
+#. Plugin editgpx
+#: build/trans_plugins.java:24
+msgid ""
+"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
+"very fast."
+msgstr "允许使用者非常快速的隐藏时间戳记并删除大量 GPX 轨迹的部分。"
+
+#. Plugin globalsat
+#: build/trans_plugins.java:28
+msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgstr "在 JOSM 中直接从 Globalsat dg100 数据记录器下载 GPS 点。"
+
+#. Plugin graphview
+#: build/trans_plugins.java:30
+msgid "Visualizes routing information as a routing graph."
+msgstr "以路线图显示视觉化路线信息"
+
+#. Plugin grid
+#: build/trans_plugins.java:32
+msgid "Provide a background layer that displays a map grid"
+msgstr "提供显示地图格线的背景图层"
+
+#. Plugin ImageWayPoint
+#: build/trans_plugins.java:34
+msgid ""
+"Another plugin to match images to the waypoints in a GPX file. A match is "
+"made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
+"the filename of an image."
+msgstr ""
+"另一个用来将图片与 GPX 文件中的航点配对的插件。配对的方式是当航点标签的 "
+"\"name\"、\"cmt\" 或 \"desc\" 属性与图片的文件名称相符时就是配对成功。"
+
+#. Plugin lakewalker
+#: build/trans_plugins.java:36
+msgid "Helps vectorizing WMS images."
+msgstr "协助将 WMS 图片矢量化。"
+
+#. Plugin livegps
+#: build/trans_plugins.java:38
+msgid ""
+"Support live GPS input (moving dot) through a connection to gpsd server."
+msgstr "支持透过连接到 gpsd 服务器的即时 GPS 输入(移动点)。"
+
+#. Plugin measurement
+#: build/trans_plugins.java:40
+msgid ""
+"Provide a measurement dialog and a layer to measure length and angle of "
+"segments, area surrounded by a (simple) closed way and create measurement "
+"paths (which also can be imported from a gps layer)."
+msgstr ""
+"提供测量对话框与图层以测量区段、由(简单的)封闭路径围绕的区域的长度与角度，并"
+"建立测量路径(也可以从 gps 图层输入)。"
+
+#. Plugin michigan_left
+#: build/trans_plugins.java:42
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
+#. Plugin multipoly-convert
+#: build/trans_plugins.java:44
+msgid "Simply convert an area to a multipolygon."
+msgstr "只把区域转换为多重多边形。"
+
+#. Plugin multipoly
+#: build/trans_plugins.java:46
+msgid ""
+"Create multipolygons by one click, much easier than standard way with "
+"relation editor."
+msgstr "点一下就可以建立多重多边形，比标准使用关系编辑器的方式更加容易。"
+
+#. Plugin nearclick
+#: build/trans_plugins.java:48
+msgid ""
+"Simulates a click when you do a small and short drag. This is useful for "
+"tablet pens, when you have problems just clicking the tablet without the "
+"mouse moving (general Java - tablet problem)."
+msgstr ""
+"当您进行小且短暂的拖曳时模拟为点击动作。这对平板电脑的触控笔很有用，当您有问"
+"题时只要点击面板而不需移动鼠标(一般性 Java - 平板电脑问题)。"
+
+#. Plugin openlayers
+#: build/trans_plugins.java:50
+msgid "Displays an OpenLayers background image"
+msgstr "显示 OpenLayers 背景图片"
+
+#. Plugin openstreetbugs
+#: build/trans_plugins.java:52
+msgid "Imports issues from OpenStreetBugs"
+msgstr "输入OpenStreetBugs 的议题"
+
+#. Plugin openvisible
+#: build/trans_plugins.java:54
+msgid ""
+"Allows opening gpx/osm files that intersect the currently visible screen area"
+msgstr "允许开启与目前可视屏幕区域交集的 gpx/osm 文件"
+
+#. Plugin osmarender
+#: build/trans_plugins.java:56
+msgid ""
+"Launches FireFox to display the current visible screen as a nice SVG image."
+msgstr "执行 FireFox 将目前可见的画面显示为很好的 SVG 图片。"
+
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:58
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+"将 gps 地点信息写入图片档的档头。在图片图层按右键菜单就可以执行这项功能。"
+
+#. Plugin PicLayer
+#: build/trans_plugins.java:60
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr "这个插件允许显示任何图片做为编辑器的背景并将它对齐地图。"
+
+#. Plugin plastic_laf
+#: build/trans_plugins.java:62
+msgid "The great JGoodies Plastic Look and Feel."
+msgstr "超棒的 JGoodies 塑胶外观与感觉。"
+
+#. Plugin public_transport
+#: build/trans_plugins.java:64
+msgid ""
+"This plugin simplifies the mapping and editing of public transport routes."
+msgstr "这个插件简化了大众运输路线的制图与编辑。"
+
+#. Plugin remotecontrol
+#: build/trans_plugins.java:66
+msgid "Let other applications send commands to JOSM."
+msgstr "让其他的应用程序传送指令给 JOSM。"
+
+#. Plugin reverter
+#: build/trans_plugins.java:68
+msgid "Plugin for reverting changesets"
+msgstr "还原更改组合的插件"
+
+#. Plugin RoadSigns
+#: build/trans_plugins.java:70
+msgid ""
+"Plugin for tagging of objects based on a selection of road signs. The dialog "
+"can be opened by clicking a small icon in the upper right corner of the "
+"properties window. Available country presets: Germany."
+msgstr ""
+
+#. Plugin routes
+#: build/trans_plugins.java:72
+msgid ""
+"Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
+"defined in routes.xml file in plugin directory"
+msgstr ""
+"绘制路线(公交车、健行路行、自行车路线等)。路线类型必须定义于插件目录的 "
+"routes.xml 文件"
+
+#. Plugin routing
+#: build/trans_plugins.java:74
+msgid "Provides routing capabilities."
+msgstr "提供路线规画的功能。"
+
+#. Plugin SimplifyArea
+#: build/trans_plugins.java:76
+msgid ""
+"Simplify area by removing nodes on very obtuse angles. This can be "
+"constrained by maximum removed area size. Also average nearby nodes."
+msgstr ""
+
+#. Plugin slippymap
+#: build/trans_plugins.java:78
+msgid ""
+"Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
+"background and request updates."
+msgstr ""
+"在 JOSM 中显示快速地图格线。可以从快速地图中载入拼贴作为背景并要求更新。"
+
+#. Plugin surveyor
+#: build/trans_plugins.java:80
+msgid "Allow adding markers/nodes on current gps positions."
+msgstr "允许在目前的 gps 位置加入标记/节点。"
+
+#. Plugin tageditor
+#: build/trans_plugins.java:82
+msgid "Provides a dialog for editing tags in a tabular grid."
+msgstr "提供在表格线中编辑标签的对话框。"
+
+#. Plugin tagging-preset-tester
+#: build/trans_plugins.java:84
+msgid ""
+"Adds a tagging preset tester to the help menu, which helps you developing of "
+"tagging presets (quick preview of the dialog that will popup). You can start "
+"the jar-file as standalone as well."
+msgstr ""
+"在帮助菜单中加入标签预设组合测试器，可以协助您进行标签预设组合的开发(会弹出快"
+"速预览对话框)。您也可以单独以 jar-文件的方式启动。"
+
+#. Plugin terracer
+#: build/trans_plugins.java:86
+msgid "Make terraced houses out of single blocks."
+msgstr "让连栋房屋能超出单一区块。"
+
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
+#. Plugin touchscreenhelper
+#: build/trans_plugins.java:90
+msgid ""
+"Provides helper buttons to allow working with single button mouse (stylus). "
+"Currently adds only one button to slip the map."
+msgstr "提供辅助按钮以便使用于单键滑键(触控笔)。目前加入单键移动地图。"
+
+#. Plugin Tracer
+#: build/trans_plugins.java:92
+msgid ""
+"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
+"to be running."
+msgstr "从捷克地籍图描出建筑物。需要有执行 TracerServer (.NET 或 Mono)。"
+
+#. Plugin turnrestrictions
+#: build/trans_plugins.java:94
+msgid ""
+"The turnrestrictions plugin allows to enter maintain information about turn "
+"restrictions in the OpenStreetMap database."
+msgstr ""
+"turnrestrictions 插件允许将转弯限制的维护信息输入到 OpenStreetMap 数据库中。"
+
+#. Plugin undelete
+#: build/trans_plugins.java:96
+msgid "Allows undeleting object from OSM database"
+msgstr "允许从 OSM 数据库中取消对象的删除"
+
+#. Plugin validator
+#: build/trans_plugins.java:98
+msgid ""
+"An OSM data validator. It checks for problems in data, and provides fixes "
+"for the common ones. Spellcheck integrated for tag names."
+msgstr ""
+"OSM 数据验证器。它会检查数据中的问题，并提供对一般问题的修正。同时整合了对标"
+"签名称的拼写检查。"
+
+#. Plugin videomapping
+#: build/trans_plugins.java:100
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+"(这个插件目前还在开发中!!!)连结并将地理参照的影片同步到 GPS 轨迹中，它可以用"
+"来辨识可见的对象。"
+
+#. Plugin walkingpapers
+#: build/trans_plugins.java:102
+msgid ""
+"Supports downloading tiled, scanned maps from walking-papers.org. This "
+"plugin is still under early development and may be buggy."
+msgstr ""
+"支持从 walking-papers.org 下载拼贴式、扫描好的地图。这个插件仍在开发的早期阶"
+"段，因此可能有许多程序错误存在。"
+
+#. Plugin waydownloader
+#: build/trans_plugins.java:104
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr "方便的下载一整组互相联结的路径"
+
+#. Plugin wayselector
+#: build/trans_plugins.java:106
+msgid "Select a sequence of non-branching connected ways"
+msgstr ""
+
+#. Plugin wms-turbo-challenge2
+#: build/trans_plugins.java:108
+msgid ""
+"Drive a race car from point A to point B over aerial imagery, leave cacti "
+"behind."
+msgstr "在航照图上将一辆赛车从 A 点开到 B 点，不管 cacti。"
+
+#. Plugin wmsplugin
+#: build/trans_plugins.java:110
+msgid ""
+"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
+msgstr "显示地理参照图片作为 JOSM 的背景(WMS 服务器、Yahoo...)。"
+
+#. <!--
+#. Pics have been derived from
+#. http://de.wikipedia.org/wiki/Bildtafel_der_Verkehrszeichen_in_Deutschland (german street sign SVGs)
+#. http://commons.wikimedia.org/wiki/Image:National_Park_Service_sample_pictographs.svg (various monochrome pictograms)
+#. http://www.kde.org
+#. http://openclipart.org/media/view/media/clip_art
+#. http://www.sjjb.co.uk/mapicons/ (meanwhile in osm svn)
+#. -->
+#. <!--
+#. item:
+#. name: the text to display
+#. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. type: the data types - way,node,relation,closedway (separated by comma)
+#. link: link to the relating map features website
+#. label: simple static text label
+#. text: the text to display
+#. key: fixed key/value pair to be set
+#. key: key to set
+#. value: value to set
+#. text: text box
+#. key: key to set
+#. text: fixed label to display
+#. default: default string to display
+#. delete_if_empty: true/false
+#. use_last_as_default: true/false
+#. combo: combo box, with multiple choices and possible to enter free form text
+#. key: key to set
+#. text: fixed label to display
+#. values: comma separated list of values
+#. display_values: comma separated list of values to be displayed instead of the
+#. database values, order and number must be equal to values
+#. default: default string to display
+#. delete_if_empty: true/false
+#. check: checkbox
+#. key: key to set
+#. text: fixed label to display
+#. default: ticked on/off
+#. delete_if_empty: true/false
+#. value_on: the value to set when checked (default is "yes")
+#. value_off: the value to set when unchecked (default is 'no')
+#. role: type to specify possible roles in relations
+#. key: the role name used in relation
+#. text: fixed label to display
+#. requisite: "optional" or "required" (default is optional)
+#. count: how often can the role occur (if not given unlimited number is assumed)
+#. type: the data types - way,node,relation,closedway (separated by comma)
+#. For external files the <annotations> should have following elements:
+#. - author           the author of the preset
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your preset meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. See also http://josm.openstreetmap.de/wiki/TaggingPresets.
+#. The fields "name", "text", "display_values" may also be localized (e.g. de.name).
+#. When translations of equal words but different meanings may conflict, a translation
+#. context should be specified. Use "name_conext", "text_context" or "values_context"
+#. for this. The context should be a meaningful short description to help translators.
+#. In JOSM internally all "name", "text" and "display_values" are translated when
+#. no specific translation has been given in XML file. When no "display_values"
+#. are supplied, then "values" will be treated as "display_values" and translated instead.
+#. -->
+#. <annotations xmlns="http://josm.openstreetmap.de/tagging-preset-1.0">
+#: build/trans_presets.java:77
+msgid "Highways"
+msgstr "公路"
+
+#. group "Highways"
+#: build/trans_presets.java:78
+msgid "Streets"
+msgstr "街道"
+
+#. group "Highways/Streets"
+#. <button label="Exit" hotkey="E">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Exit"/>
+#. </button>
+#: build/trans_presets.java:79 build/trans_surveyor.java:72
+msgid "Motorway"
+msgstr "高速公路(Motorway)"
+
+#. item "Highways/Streets/Motorway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
+#: build/trans_presets.java:82
+msgid "Edit Motorway"
+msgstr "编辑高速公路"
+
+#. item "Highways/Streets/Motorway" label "Edit Motorway"
+#. <space />
+#. <key key="highway" value="motorway" />
+#. item "Highways/Streets/Trunk" label "Edit Trunk"
+#. <space />
+#. <key key="highway" value="trunk" />
+#. item "Highways/Streets/Trunk Link" label "Edit Trunk Link"
+#. <space />
+#. <key key="highway" value="trunk_link" />
+#. item "Highways/Streets/Primary" label "Edit Primary Road"
+#. <space />
+#. <key key="highway" value="primary" />
+#. item "Highways/Streets/Secondary" label "Edit Secondary Road"
+#. <space />
+#. <key key="highway" value="secondary" />
+#. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
+#. <space />
+#. <key key="highway" value="tertiary" />
+#. item "Airport/Runway" label "Edit Runway"
+#. <key key="aeroway" value="runway" />
+#. <optional>
+#. item "Airport/Taxiway" label "Edit Taxiway"
+#. <key key="aeroway" value="taxiway" />
+#. <optional>
+#. item "Airport/Helipad" label "Edit Helipad"
+#. <key key="aeroway" value="helipad" />
+#. <optional>
+#. item "Airport/Gate" label "Edit Terminal Gate"
+#. <key key="aeroway" value="gate" />
+#. item "Man Made/Power Station" text "Operator"
+#. item "Relations/Route" text "Name"
+#: build/trans_presets.java:85 build/trans_presets.java:121
+#: build/trans_presets.java:141 build/trans_presets.java:161
+#: build/trans_presets.java:198 build/trans_presets.java:218
+#: build/trans_presets.java:1534 build/trans_presets.java:1542
+#: build/trans_presets.java:1550 build/trans_presets.java:1584
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
+msgid "Reference"
+msgstr "道路编号"
+
+#. item "Highways/Streets/Motorway" combo "Layer"
+#. item "Highways/Streets/Motorway Link" combo "Layer"
+#. item "Highways/Streets/Trunk" combo "Layer"
+#. item "Highways/Streets/Trunk Link" combo "Layer"
+#. item "Highways/Streets/Primary" combo "Layer"
+#. item "Highways/Streets/Primary Link" combo "Layer"
+#. item "Highways/Streets/Secondary" combo "Layer"
+#. item "Highways/Streets/Roundabout" combo "Layer"
+#: build/trans_presets.java:89 build/trans_presets.java:106
+#: build/trans_presets.java:125 build/trans_presets.java:144
+#: build/trans_presets.java:165 build/trans_presets.java:181
+#: build/trans_presets.java:202 build/trans_presets.java:420
+msgid "Lanes"
+msgstr "车道数"
+
+#. item "Highways/Streets/Motorway" combo "Lanes"
+#. item "Highways/Streets/Motorway Link" combo "Lanes"
+#. item "Highways/Streets/Trunk" combo "Lanes"
+#. item "Highways/Streets/Trunk Link" combo "Lanes"
+#. item "Highways/Streets/Primary" combo "Lanes"
+#. item "Highways/Streets/Primary Link" combo "Lanes"
+#. item "Highways/Streets/Secondary" combo "Lanes"
+#. item "Highways/Streets/Tertiary" combo "Layer"
+#. item "Highways/Streets/Unclassified" combo "Layer"
+#. item "Highways/Streets/Bridge" combo "Layer"
+#. item "Highways/Streets/Tunnel" combo "Layer"
+#. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
+#: build/trans_presets.java:90 build/trans_presets.java:107
+#: build/trans_presets.java:126 build/trans_presets.java:145
+#: build/trans_presets.java:166 build/trans_presets.java:182
+#: build/trans_presets.java:203 build/trans_presets.java:222
+#: build/trans_presets.java:246 build/trans_presets.java:321
+#: build/trans_presets.java:353 build/trans_presets.java:373
+#: build/trans_presets.java:395 build/trans_presets.java:435
+#: build/trans_presets.java:450 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:1255
+msgid "Max. speed (km/h)"
+msgstr "最高限速 (km/h)"
+
+#. item "Highways/Streets/Motorway" text "Max. speed (km/h)"
+#. item "Highways/Streets/Motorway Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Trunk" text "Max. speed (km/h)"
+#. item "Highways/Streets/Trunk Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Primary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Primary Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Secondary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Tertiary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Unclassified" text "Name"
+#. item "Highways/Streets/Residential" text "Name"
+#. <optional>
+#. item "Highways/Streets/Living Street" text "Name"
+#. <optional>
+#. item "Highways/Streets/Pedestrian" text "Name"
+#. <optional>
+#. item "Highways/Streets/Service" text "Name"
+#. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
+#. <space />
+#. <key key="highway" value="service" />
+#. <key key="service" value="parking_aisle" />
+#. <optional>
+#. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
+#. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
+#. item "Highways/Streets/Roundabout" text "Name"
+#. item "Ways/Track" check "Embankment"
+#. item "Ways/Path" check "Embankment"
+#. item "Transport/Railway/Bus Guideway" text "Name"
+#: build/trans_presets.java:91 build/trans_presets.java:108
+#: build/trans_presets.java:127 build/trans_presets.java:146
+#: build/trans_presets.java:167 build/trans_presets.java:183
+#: build/trans_presets.java:204 build/trans_presets.java:223
+#: build/trans_presets.java:239 build/trans_presets.java:258
+#: build/trans_presets.java:276 build/trans_presets.java:294
+#: build/trans_presets.java:313 build/trans_presets.java:334
+#: build/trans_presets.java:346 build/trans_presets.java:365
+#: build/trans_presets.java:382 build/trans_presets.java:414
+#: build/trans_presets.java:471 build/trans_presets.java:495
+#: build/trans_presets.java:517 build/trans_presets.java:537
+#: build/trans_presets.java:560 build/trans_presets.java:582
+#: build/trans_presets.java:620 build/trans_presets.java:1248
+msgid "Oneway"
+msgstr "单行道"
+
+#. item "Highways/Streets/Motorway" check "Oneway"
+#. item "Highways/Streets/Motorway Link" check "Oneway"
+#. item "Highways/Streets/Trunk" check "Motorroad"
+#. item "Highways/Streets/Trunk Link" check "Motorroad"
+#. item "Highways/Streets/Primary" check "Motorroad"
+#. item "Highways/Streets/Primary Link" check "Motorroad"
+#. item "Highways/Streets/Secondary" check "Oneway"
+#. item "Highways/Streets/Tertiary" check "Oneway"
+#. item "Highways/Streets/Unclassified" check "Oneway"
+#. item "Highways/Streets/Residential" check "Oneway"
+#. item "Highways/Streets/Living Street" check "Oneway"
+#. item "Highways/Streets/Pedestrian" check "Oneway"
+#. item "Highways/Streets/Service" check "Oneway"
+#. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
+#. item "Highways/Streets/Roundabout" check "Oneway"
+#. item "Highways/Streets/Roundabout" text "Width (meters)"
+#. </optional>
+#. item "Ways/Track" combo "MTB Scale"
+#. item "Ways/Dedicated Bridleway" check "Oneway"
+#. item "Ways/Dedicated Cycleway" check "Oneway"
+#. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
+#. item "Ways/Combined Foot- and Cycleway" check "Oneway"
+#. item "Ways/Steps" check "Oneway"
+#. item "Transport/Railway/Bus Guideway" check "Oneway"
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="tunnel start"/>
+#. <!--action class="ConsolePrinterAction" params="tunnel start,tunnel"/-->
+#. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
+#. </button>
+#: build/trans_presets.java:92 build/trans_presets.java:109
+#: build/trans_presets.java:129 build/trans_presets.java:148
+#: build/trans_presets.java:169 build/trans_presets.java:185
+#: build/trans_presets.java:205 build/trans_presets.java:224
+#: build/trans_presets.java:240 build/trans_presets.java:259
+#: build/trans_presets.java:277 build/trans_presets.java:295
+#: build/trans_presets.java:314 build/trans_presets.java:347
+#: build/trans_presets.java:366 build/trans_presets.java:415
+#: build/trans_presets.java:424 build/trans_presets.java:467
+#: build/trans_presets.java:491 build/trans_presets.java:518
+#: build/trans_presets.java:538 build/trans_presets.java:561
+#: build/trans_presets.java:583 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1249
+#: build/trans_surveyor.java:12
+msgid "Bridge"
+msgstr "桥"
+
+#. item "Highways/Streets/Motorway" check "Bridge"
+#. item "Highways/Streets/Motorway Link" check "Bridge"
+#. item "Highways/Streets/Trunk" check "Bridge"
+#. item "Highways/Streets/Trunk Link" check "Bridge"
+#. item "Highways/Streets/Primary" check "Bridge"
+#. item "Highways/Streets/Primary Link" check "Bridge"
+#. item "Highways/Streets/Secondary" check "Bridge"
+#. item "Highways/Streets/Tertiary" check "Bridge"
+#. item "Highways/Streets/Unclassified" check "Bridge"
+#. item "Highways/Streets/Residential" check "Bridge"
+#. item "Highways/Streets/Living Street" check "Bridge"
+#. item "Highways/Streets/Pedestrian" check "Bridge"
+#. item "Highways/Streets/Service" check "Bridge"
+#. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
+#. item "Highways/Streets/Roundabout" check "Bridge"
+#. item "Highways/Streets/Bridge" text "Width (meters)"
+#. </optional>
+#. item "Ways/Track" check "Bridge"
+#. item "Ways/Path" check "Bridge"
+#. item "Ways/Dedicated Bridleway" check "Bridge"
+#. item "Ways/Dedicated Cycleway" check "Bridge"
+#. item "Ways/Segregated Foot- and Cycleway" check "Bridge"
+#. item "Ways/Combined Foot- and Cycleway" check "Bridge"
+#. item "Ways/Dedicated Footway" check "Bridge"
+#. item "Ways/Steps" check "Bridge"
+#. item "Transport/Railway/Bus Guideway" check "Bridge"
+#: build/trans_presets.java:93 build/trans_presets.java:110
+#: build/trans_presets.java:130 build/trans_presets.java:149
+#: build/trans_presets.java:170 build/trans_presets.java:186
+#: build/trans_presets.java:206 build/trans_presets.java:225
+#: build/trans_presets.java:241 build/trans_presets.java:260
+#: build/trans_presets.java:278 build/trans_presets.java:296
+#: build/trans_presets.java:315 build/trans_presets.java:348
+#: build/trans_presets.java:367 build/trans_presets.java:416
+#: build/trans_presets.java:440 build/trans_presets.java:468
+#: build/trans_presets.java:492 build/trans_presets.java:519
+#: build/trans_presets.java:539 build/trans_presets.java:562
+#: build/trans_presets.java:584 build/trans_presets.java:602
+#: build/trans_presets.java:622 build/trans_presets.java:1250
+msgid "Tunnel"
+msgstr "隧道"
+
+#. item "Highways/Streets/Motorway" check "Tunnel"
+#. item "Highways/Streets/Motorway Link" check "Tunnel"
+#. item "Highways/Streets/Trunk" check "Tunnel"
+#. item "Highways/Streets/Trunk Link" check "Tunnel"
+#. item "Highways/Streets/Primary" check "Tunnel"
+#. item "Highways/Streets/Primary Link" check "Tunnel"
+#. item "Highways/Streets/Secondary" check "Tunnel"
+#. item "Highways/Streets/Tertiary" check "Tunnel"
+#. item "Highways/Streets/Unclassified" check "Tunnel"
+#. item "Highways/Streets/Residential" check "Tunnel"
+#. item "Highways/Streets/Living Street" check "Tunnel"
+#. item "Highways/Streets/Pedestrian" check "Tunnel"
+#. item "Highways/Streets/Service" check "Tunnel"
+#. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
+#. item "Highways/Streets/Roundabout" check "Tunnel"
+#. item "Ways/Track" check "Tunnel"
+#. item "Ways/Path" check "Tunnel"
+#. item "Ways/Dedicated Bridleway" check "Tunnel"
+#. item "Ways/Dedicated Cycleway" check "Tunnel"
+#. item "Ways/Segregated Foot- and Cycleway" check "Tunnel"
+#. item "Ways/Combined Foot- and Cycleway" check "Tunnel"
+#. item "Ways/Dedicated Footway" check "Tunnel"
+#. item "Ways/Steps" check "Tunnel"
+#. item "Transport/Railway/Bus Guideway" check "Tunnel"
+#: build/trans_presets.java:94 build/trans_presets.java:111
+#: build/trans_presets.java:131 build/trans_presets.java:150
+#: build/trans_presets.java:171 build/trans_presets.java:187
+#: build/trans_presets.java:207 build/trans_presets.java:226
+#: build/trans_presets.java:242 build/trans_presets.java:261
+#: build/trans_presets.java:279 build/trans_presets.java:297
+#: build/trans_presets.java:316 build/trans_presets.java:349
+#: build/trans_presets.java:368 build/trans_presets.java:417
+#: build/trans_presets.java:469 build/trans_presets.java:493
+#: build/trans_presets.java:520 build/trans_presets.java:540
+#: build/trans_presets.java:563 build/trans_presets.java:585
+#: build/trans_presets.java:603 build/trans_presets.java:623
+#: build/trans_presets.java:1251
+msgid "Cutting"
+msgstr "断开"
+
+#. item "Highways/Streets/Motorway" check "Cutting"
+#. item "Highways/Streets/Motorway Link" check "Cutting"
+#. item "Highways/Streets/Trunk" check "Cutting"
+#. item "Highways/Streets/Trunk Link" check "Cutting"
+#. item "Highways/Streets/Primary" check "Cutting"
+#. item "Highways/Streets/Primary Link" check "Cutting"
+#. item "Highways/Streets/Secondary" check "Cutting"
+#. item "Highways/Streets/Tertiary" check "Cutting"
+#. item "Highways/Streets/Unclassified" check "Cutting"
+#. item "Highways/Streets/Residential" check "Cutting"
+#. item "Highways/Streets/Living Street" check "Cutting"
+#. item "Highways/Streets/Pedestrian" check "Cutting"
+#. item "Highways/Streets/Service" check "Cutting"
+#. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
+#. item "Highways/Streets/Roundabout" check "Cutting"
+#. item "Ways/Track" check "Cutting"
+#. item "Ways/Path" check "Cutting"
+#. item "Ways/Dedicated Bridleway" check "Cutting"
+#. item "Ways/Dedicated Cycleway" check "Cutting"
+#. item "Ways/Segregated Foot- and Cycleway" check "Cutting"
+#. item "Ways/Combined Foot- and Cycleway" check "Cutting"
+#. item "Ways/Dedicated Footway" check "Cutting"
+#. item "Ways/Steps" check "Cutting"
+#. item "Transport/Railway/Bus Guideway" check "Cutting"
+#: build/trans_presets.java:95 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:151
+#: build/trans_presets.java:172 build/trans_presets.java:188
+#: build/trans_presets.java:208 build/trans_presets.java:227
+#: build/trans_presets.java:243 build/trans_presets.java:262
+#: build/trans_presets.java:280 build/trans_presets.java:298
+#: build/trans_presets.java:317 build/trans_presets.java:350
+#: build/trans_presets.java:369 build/trans_presets.java:418
+#: build/trans_presets.java:470 build/trans_presets.java:494
+#: build/trans_presets.java:521 build/trans_presets.java:541
+#: build/trans_presets.java:564 build/trans_presets.java:586
+#: build/trans_presets.java:604 build/trans_presets.java:624
+#: build/trans_presets.java:1252
+msgid "Embankment"
+msgstr "堤防"
+
+#. item "Highways/Streets/Motorway" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:98
+msgid "Motorway Link"
+msgstr "高速公路连络线"
+
+#. item "Highways/Streets/Motorway Link"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
+#: build/trans_presets.java:101
+msgid "Edit Motorway Link"
+msgstr "编辑高速公路连络线"
+
+#. item "Highways/Streets/Motorway Link" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:115
+msgid "Trunk"
+msgstr "快速道路(Trunk)"
+
+#. item "Highways/Streets/Trunk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
+#: build/trans_presets.java:118
+msgid "Edit Trunk"
+msgstr "编辑快速道路"
+
+#. item "Highways/Streets/Trunk" check "Oneway"
+#. item "Highways/Streets/Trunk Link" check "Oneway"
+#. item "Highways/Streets/Primary" check "Oneway"
+#. item "Highways/Streets/Primary Link" check "Oneway"
+#: build/trans_presets.java:128 build/trans_presets.java:147
+#: build/trans_presets.java:168 build/trans_presets.java:184
+msgid "Motorroad"
+msgstr "汽车专用"
+
+#. item "Highways/Streets/Trunk" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:135
+msgid "Trunk Link"
+msgstr "快速道路连络线"
+
+#. item "Highways/Streets/Trunk Link"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
+#: build/trans_presets.java:138
+msgid "Edit Trunk Link"
+msgstr "编辑快速道路连络线"
+
+#. item "Highways/Streets/Trunk Link" check "Embankment"
+#. </optional>
+#. <separator/>
+#. <button label="Motorway" hotkey="1">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Motorway"/>
+#. </button>
+#: build/trans_presets.java:155 build/trans_surveyor.java:76
+msgid "Primary"
+msgstr "一级道路(Primary)"
+
+#. item "Highways/Streets/Primary"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
+#: build/trans_presets.java:158
+msgid "Edit Primary Road"
+msgstr "编辑一级道路"
+
+#. item "Highways/Streets/Primary" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:175
+msgid "Primary Link"
+msgstr "一级道路连络线"
+
+#. item "Highways/Streets/Primary Link"
+#: build/trans_presets.java:176
+msgid "Edit Primary Link"
+msgstr "编辑一级道路连络线"
+
+#. item "Highways/Streets/Primary Link" check "Embankment"
+#. </optional>
+#. <button label="Primary" hotkey="2">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Primary"/>
+#. </button>
+#: build/trans_presets.java:191 build/trans_surveyor.java:80
+msgid "Secondary"
+msgstr "二级道路(Secondary)"
+
+#. item "Highways/Streets/Secondary"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
+#: build/trans_presets.java:195
+msgid "Edit Secondary Road"
+msgstr "编辑二级道路"
+
+#. item "Highways/Streets/Secondary" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:211
+msgid "Tertiary"
+msgstr "三级道路(Tertiary)"
+
+#. item "Highways/Streets/Tertiary"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
+#: build/trans_presets.java:215
+msgid "Edit Tertiary Road"
+msgstr "编辑三级道路"
+
+#. item "Highways/Streets/Tertiary" check "Embankment"
+#. </optional>
+#. <button label="Secondary" hotkey="3">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Secondary"/>
+#. </button>
+#: build/trans_presets.java:230 build/trans_surveyor.java:84
+msgid "Unclassified"
+msgstr "未分类道路(Unclassified)"
+
+#. item "Highways/Streets/Unclassified"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
+#: build/trans_presets.java:234
+msgid "Edit Unclassified Road"
+msgstr "编辑未分类道路"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:244 build/trans_presets.java:318
+#: build/trans_presets.java:587 build/trans_presets.java:605
+msgid "Passing Places"
+msgstr "让车区"
+
+#. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
+#. item "Highways/Streets/Service" text "Max. speed (km/h)"
+#. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
+#. item "Highways/Streets/Roundabout" combo "Lanes"
+#. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
+#. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
+#. item "Ways/Path" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
+#. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
+#. item "Public Transport/Railway Platform" text "Reference (track number)"
+#. item "Public Transport/Bus Platform" text "Reference (track number)"
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:301
+#: build/trans_presets.java:322 build/trans_presets.java:354
+#: build/trans_presets.java:374 build/trans_presets.java:421
+#: build/trans_presets.java:437 build/trans_presets.java:451
+#: build/trans_presets.java:476 build/trans_presets.java:505
+#: build/trans_presets.java:524 build/trans_presets.java:544
+#: build/trans_presets.java:566 build/trans_presets.java:589
+#: build/trans_presets.java:607 build/trans_presets.java:626
+#: build/trans_presets.java:1256 build/trans_presets.java:1460
+#: build/trans_presets.java:1505
+msgid "Width (meters)"
+msgstr "宽度 (米)"
+
+#. item "Highways/Streets/Unclassified" text "Width (meters)"
+#. </optional>
+#. <button label="Unclassified" hotkey="4">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Unclassified"/>
+#. </button>
+#: build/trans_presets.java:250 build/trans_surveyor.java:88
+msgid "Residential"
+msgstr "居住区道路(Residential)"
+
+#. item "Highways/Streets/Residential"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
+#: build/trans_presets.java:253
+msgid "Edit Residential Street"
+msgstr "编辑居住区道路"
+
+#. item "Highways/Streets/Residential" combo "Layer"
+#. item "Highways/Streets/Living Street" combo "Layer"
+#. item "Highways/Streets/Pedestrian" combo "Layer"
+#. item "Highways/Streets/Service" combo "Layer"
+#. item "Highways/Streets/Parking Aisle" check "Oneway"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
+#. item "Transport/Railway/Bus Guideway" combo "Layer"
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
+msgid "Surface"
+msgstr "路面"
+
+#. item "Highways/Streets/Residential" combo "Surface"
+#. item "Highways/Streets/Living Street" combo "Surface"
+#. item "Highways/Streets/Pedestrian" combo "Surface"
+#. item "Highways/Streets/Service" combo "Surface"
+#. item "Highways/Streets/Parking Aisle" combo "Surface"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
+#. item "Ways/Track" combo "Surface"
+#. item "Ways/Path" combo "Surface"
+#. item "Ways/Dedicated Bridleway" combo "Surface"
+#. item "Ways/Dedicated Cycleway" combo "Surface"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface"
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface"
+#. item "Ways/Dedicated Footway" combo "Surface"
+#. item "Ways/Steps" combo "Surface"
+#. item "Transport/Railway/Bus Guideway" combo "Surface"
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
+msgid "paved"
+msgstr "有铺面的"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
+msgid "unpaved"
+msgstr "没铺面的"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
+msgid "asphalt"
+msgstr "柏油"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
+msgid "concrete"
+msgstr "水泥地"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
+msgid "metal"
+msgstr "金属"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
+msgid "wood"
+msgstr "木头"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
+msgid "paving_stones"
+msgstr ""
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
+msgid "cobblestone"
+msgstr "石子路"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
+msgid "gravel"
+msgstr "碎石路"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
+msgid "pebblestone"
+msgstr "鹅卵石"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
+msgid "compacted"
+msgstr "压实的"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:488
+#: build/trans_presets.java:516 build/trans_presets.java:536
+#: build/trans_presets.java:559 build/trans_presets.java:581
+#: build/trans_presets.java:600 build/trans_presets.java:619
+#: build/trans_presets.java:1254
+msgid "grass_paver"
+msgstr "草地_铺面"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
+msgid "grass"
+msgstr "草地"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
+msgid "sand"
+msgstr "沙地"
+
+#: build/trans_presets.java:264 build/trans_presets.java:282
+#: build/trans_presets.java:300 build/trans_presets.java:320
+#: build/trans_presets.java:335 build/trans_presets.java:352
+#: build/trans_presets.java:371 build/trans_presets.java:465
+#: build/trans_presets.java:488 build/trans_presets.java:516
+#: build/trans_presets.java:536 build/trans_presets.java:559
+#: build/trans_presets.java:581 build/trans_presets.java:600
+#: build/trans_presets.java:619 build/trans_presets.java:1254
+msgid "ground"
+msgstr "地面"
+
+#. item "Highways/Streets/Residential" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:268
+msgid "Living Street"
+msgstr "生活街道"
+
+#. item "Highways/Streets/Living Street"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
+#: build/trans_presets.java:271
+msgid "Edit Living Street"
+msgstr "编辑生活街道"
+
+#. item "Highways/Streets/Living Street" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:286
+msgid "Pedestrian"
+msgstr "徒步区"
+
+#. item "Highways/Streets/Pedestrian"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
+#: build/trans_presets.java:289
+msgid "Edit Pedestrian Street"
+msgstr "编辑徒步区街道"
+
+#. item "Highways/Streets/Pedestrian" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:304
+msgid "Service"
+msgstr "服务道路(Service)"
+
+#. item "Highways/Streets/Service"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
+#: build/trans_presets.java:307
+msgid "Edit Serviceway"
+msgstr "编辑服务道路"
+
+#. item "Highways/Streets/Service" label "Edit Serviceway"
+#. <space />
+#. <key key="highway" value="service" />
+#. <optional>
+#: build/trans_presets.java:311
+msgid "Serviceway type"
+msgstr "服务道路类型"
+
+#. item "Highways/Streets/Service" combo "Serviceway type"
+#: build/trans_presets.java:311
+msgid "alley"
+msgstr "巷/弄"
+
+#: build/trans_presets.java:311
+msgid "driveway"
+msgstr "车道"
+
+#: build/trans_presets.java:311
+msgid "parking_aisle"
+msgstr "停车场通道"
+
+#. item "Highways/Streets/Service" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:325
+msgid "Parking Aisle"
+msgstr "停车场通道"
+
+#. item "Highways/Streets/Parking Aisle"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
+#: build/trans_presets.java:329
+msgid "Edit Parking Aisle"
+msgstr "编辑停车场通道"
+
+#. </optional>
+#: build/trans_presets.java:338
+msgid "Road (Unknown Type)"
+msgstr "道路(不明的类型)"
+
+#. item "Highways/Streets/Road (Unknown Type)"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
+#: build/trans_presets.java:341
+msgid "Edit Road of unknown type"
+msgstr "编辑不明类型的道路"
+
+#. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:357
+msgid "Construction"
+msgstr "施工"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:358
+msgid "Edit Highway Under Construction"
+msgstr "编辑施工中的公路"
+
+#: build/trans_presets.java:372
+msgid "Junction"
+msgstr "交叉点"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:372 build/trans_style.java:923
+msgid "roundabout"
+msgstr "环岛"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:378
+msgid "Road Restrictions"
+msgstr "道路限制"
+
+#. item "Highways/Streets/Road Restrictions"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
+#: build/trans_presets.java:381
+msgid "Edit Road Restrictions"
+msgstr "编辑道路限制"
+
+#. item "Highways/Streets/Road Restrictions" check "Oneway"
+#: build/trans_presets.java:383
+msgid "Toll"
+msgstr "收费"
+
+#. item "Highways/Streets/Road Restrictions" check "Toll"
+#: build/trans_presets.java:384
+msgid "No exit (cul-de-sac)"
+msgstr "没有出口(死路)"
+
+#. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
+#. item "Ways/Track" combo "Layer"
+#: build/trans_presets.java:385 build/trans_presets.java:473
+msgid "Access"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" combo "Access"
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle"
+#. item "Highways/Streets/Road Restrictions" combo "Foot"
+#. item "Highways/Streets/Road Restrictions" combo "Goods"
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Highways/Streets/Road Restrictions" combo "Horse"
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle"
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar"
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Path" combo "Foot"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Parking" combo "Park and Ride"
+#. item "Car/Parking" combo "Fee"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Car/Parking" combo "Spaces for Women"
+#. item "Car/Parking" combo "Spaces for Parents"
+#. item "Public Transport/Bus Stop" combo "Shelter"
+#. item "Public Transport/Bus Stop" combo "Bench"
+#. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Tourism/Information Terminal" combo "Fee"
+#. item "Tourism/Audioguide" combo "Fee"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Amenities/Bench" combo "Backrest"
+#. item "Amenities/Hunting Stand" combo "Shelter"
+#. item "Amenities/Hunting Stand" combo "Hide"
+#. item "Amenities/Hunting Stand" combo "Lock"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:499 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+#: build/trans_presets.java:542 build/trans_presets.java:678
+#: build/trans_presets.java:1164 build/trans_presets.java:1176
+#: build/trans_presets.java:1188 build/trans_presets.java:1200
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1373
+#: build/trans_presets.java:1374 build/trans_presets.java:1375
+#: build/trans_presets.java:1494 build/trans_presets.java:1495
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
+msgid "yes"
+msgstr "是"
+
+#. color permissive
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="private"/>
+#: build/trans_presets.java:385 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_style.java:212
+msgid "private"
+msgstr "私人"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_style.java:219
+msgid "destination"
+msgstr "目的地"
+
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--restrictions tags -->
+#. <!--the restrictions rules should be placed before the path rule! -->
+#.
+#. <rule>
+#. <condition k="access" b="no"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="permissive"/>
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_style.java:205
+msgid "permissive"
+msgstr "随意"
+
+#: build/trans_presets.java:385 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:473
+#: build/trans_presets.java:474 build/trans_presets.java:475
+msgid "agricultural"
+msgstr "农业"
+
+#: build/trans_presets.java:385 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:473
+#: build/trans_presets.java:474 build/trans_presets.java:475
+msgid "forestry"
+msgstr "林业"
+
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:385 build/trans_presets.java:386
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:490
+#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:499
+#: build/trans_presets.java:500 build/trans_presets.java:501
+#: build/trans_presets.java:502 build/trans_presets.java:542
+#: build/trans_presets.java:654 build/trans_presets.java:669
+#: build/trans_presets.java:1164 build/trans_presets.java:1176
+#: build/trans_presets.java:1188 build/trans_presets.java:1200
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 build/trans_presets.java:1278
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1373 build/trans_presets.java:1374
+#: build/trans_presets.java:1375 build/trans_presets.java:1494
+#: build/trans_presets.java:1495 build/trans_presets.java:1496
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
+msgid "no"
+msgstr "否"
+
+#: build/trans_presets.java:386
+msgid "Agricultural"
+msgstr "农业的"
+
+#: build/trans_presets.java:386 build/trans_presets.java:387
+#: build/trans_presets.java:388 build/trans_presets.java:389
+#: build/trans_presets.java:390 build/trans_presets.java:391
+#: build/trans_presets.java:392 build/trans_presets.java:393
+#: build/trans_presets.java:394 build/trans_presets.java:473
+#: build/trans_presets.java:474 build/trans_presets.java:475
+#: build/trans_presets.java:496 build/trans_presets.java:497
+#: build/trans_presets.java:498 build/trans_presets.java:500
+#: build/trans_presets.java:501 build/trans_presets.java:502
+msgid "designated"
+msgstr "已指定"
+
+#: build/trans_presets.java:387 build/trans_presets.java:388
+#: build/trans_presets.java:389 build/trans_presets.java:390
+#: build/trans_presets.java:391 build/trans_presets.java:392
+#: build/trans_presets.java:393 build/trans_presets.java:394
+#: build/trans_presets.java:473 build/trans_presets.java:474
+#: build/trans_presets.java:475 build/trans_presets.java:496
+#: build/trans_presets.java:497 build/trans_presets.java:498
+#: build/trans_presets.java:500 build/trans_presets.java:501
+msgid "official"
+msgstr "正式"
+
+#: build/trans_presets.java:389
+msgid "Goods"
+msgstr "货物"
+
+#: build/trans_presets.java:390
+msgid "Heavy Goods Vehicles (hgv)"
+msgstr "大型车 (hgv)"
+
+#. item "Barriers/Bollard" check "Bicycle"
+#. item "Barriers/Spikes" check "Bicycle"
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
+#. item "Barriers/Gate" check "Bicycle"
+#. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
+#. item "Barriers/Sally Port" check "Bicycle"
+#: build/trans_presets.java:391 build/trans_presets.java:498
+#: build/trans_presets.java:755 build/trans_presets.java:788
+#: build/trans_presets.java:810 build/trans_presets.java:847
+#: build/trans_presets.java:860 build/trans_presets.java:872
+#: build/trans_presets.java:884 build/trans_presets.java:896
+#: build/trans_presets.java:936
+msgid "Horse"
+msgstr "马"
+
+#. item "Barriers/Bollard" check "Horse"
+#. item "Barriers/Cattle Grid" check "Bicycle"
+#. item "Barriers/Spikes" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
+#. item "Barriers/Gate" check "Horse"
+#. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
+#. item "Barriers/Sally Port" check "Horse"
+#: build/trans_presets.java:392 build/trans_presets.java:474
+#: build/trans_presets.java:756 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:811
+#: build/trans_presets.java:848 build/trans_presets.java:861
+#: build/trans_presets.java:873 build/trans_presets.java:885
+#: build/trans_presets.java:897 build/trans_presets.java:937
+msgid "Motorcycle"
+msgstr "摩托车"
+
+#. item "Barriers/Cattle Grid" check "Motorcycle"
+#. item "Barriers/Spikes" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
+#. item "Barriers/Gate" check "Motorcycle"
+#. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
+#. item "Barriers/Sally Port" check "Motorcycle"
+#: build/trans_presets.java:393 build/trans_presets.java:475
+#: build/trans_presets.java:502 build/trans_presets.java:775
+#: build/trans_presets.java:790 build/trans_presets.java:812
+#: build/trans_presets.java:849 build/trans_presets.java:862
+#: build/trans_presets.java:874 build/trans_presets.java:886
+#: build/trans_presets.java:898 build/trans_presets.java:938
+msgid "Motorcar"
+msgstr "汽车"
+
+#: build/trans_presets.java:394
+msgid "Public Service Vehicles (psv)"
+msgstr "公共汽车 (psv)"
+
+#. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
+#: build/trans_presets.java:396
+msgid "Min. speed (km/h)"
+msgstr "最低限速 (km/h)"
+
+#. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
+#. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
+#: build/trans_presets.java:397 build/trans_presets.java:436
+msgid "Max. weight (tonnes)"
+msgstr "总重限制(吨)"
+
+#. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
+#: build/trans_presets.java:398
+msgid "Max. Height (meters)"
+msgstr "高度限制(米)"
+
+#. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
+#: build/trans_presets.java:399
+msgid "Max. Width (meters)"
+msgstr "宽度限制(米)"
+
+#. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
+#: build/trans_presets.java:400
+msgid "Max. Length (meters)"
+msgstr "长度限制(米)"
+
+#. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
+#. <separator/>
+#: build/trans_presets.java:403
+msgid "Roundabout"
+msgstr "环岛"
+
+#. item "Highways/Streets/Roundabout"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
+#. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
+#: build/trans_presets.java:408
+msgid "Edit Junction"
+msgstr "编辑交叉点"
+
+#. item "Highways/Streets/Roundabout" combo "Type"
+#. color motorroad
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="motorway"/>
+#. color motorway
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="motorway_link"/>
+#: build/trans_presets.java:411 build/trans_style.java:553
+#: build/trans_style.java:561
+msgid "motorway"
+msgstr "高速公路"
+
+#: build/trans_presets.java:411
+msgid "motorway_link"
+msgstr "高速公路连络线"
+
+#. color motorway
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="trunk"/>
+#. color trunk
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="trunk_link"/>
+#: build/trans_presets.java:411 build/trans_style.java:569
+#: build/trans_style.java:577
+msgid "trunk"
+msgstr "快速道路"
+
+#: build/trans_presets.java:411
+msgid "trunk_link"
+msgstr "快速道路连络线"
+
+#. color trunk
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="primary"/>
+#. color primary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="primary_link"/>
+#: build/trans_presets.java:411 build/trans_style.java:585
+#: build/trans_style.java:593
+msgid "primary"
+msgstr "一级道路"
+
+#: build/trans_presets.java:411
+msgid "primary_link"
+msgstr "一级道路连络线"
+
+#. color primary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="secondary"/>
+#. color secondary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>300000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="secondary_link"/>
+#: build/trans_presets.java:411 build/trans_style.java:601
+#: build/trans_style.java:609
+msgid "secondary"
+msgstr "二级道路"
+
+#. color secondary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>300000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="tertiary"/>
+#: build/trans_presets.java:411 build/trans_style.java:617
+msgid "tertiary"
+msgstr "三级道路"
+
+#: build/trans_presets.java:411
+msgid "unclassified"
+msgstr "未分类道路"
+
+#. color green
+#. <icon src="misc/landmark/plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="residential"/>
+#: build/trans_presets.java:411 build/trans_style.java:3293
+msgid "residential"
+msgstr "居住区道路"
+
+#: build/trans_presets.java:411
+msgid "living_street"
+msgstr "生活街道"
+
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="service"/>
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="fixme"/>
+#. <icon annotate="true" src="fixme.png" priority="-10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="FIXME"/>
+#. <icon annotate="true" src="fixme.png" priority="-10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:411 build/trans_style.java:673
+#: build/trans_style.java:4436
+msgid "service"
+msgstr "服务道路"
+
+#: build/trans_presets.java:411
+msgid "bus_guideway"
+msgstr "有轨电车专用道"
+
+#. color turningcircle
+#. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="construction"/>
+#. color railland
+#. <icon src="transport/railway_station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="construction"/>
+#. color construction
+#: build/trans_presets.java:411 build/trans_style.java:905
+#: build/trans_style.java:3358 build/trans_style.java:3359
+msgid "construction"
+msgstr "施工"
+
+#. item "Highways/Streets/Bridge"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
+#: build/trans_presets.java:429
+msgid "Edit Bridge"
+msgstr "编辑桥梁"
+
+#. item "Highways/Streets/Tunnel"
+#: build/trans_presets.java:441
+msgid "Edit Tunnel"
+msgstr "编辑隧道"
+
+#. item "Highways/Streets/Tunnel" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:455
+msgid "Ways"
+msgstr "路径"
+
+#. group "Ways"
+#: build/trans_presets.java:456
+msgid "Track"
+msgstr "路辙"
+
+#. item "Ways/Track"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
+#: build/trans_presets.java:459
+msgid "Edit Track"
+msgstr "编辑路辙"
+
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:464
+msgid "Tracktype"
+msgstr "路辙类型"
+
+#. item "Ways/Track" combo "Tracktype"
+#: build/trans_presets.java:464
+msgid "grade1"
+msgstr "第一级"
+
+#: build/trans_presets.java:464
+msgid "grade2"
+msgstr "第二级"
+
+#: build/trans_presets.java:464
+msgid "grade3"
+msgstr "第三级"
+
+#: build/trans_presets.java:464
+msgid "grade4"
+msgstr "第四级"
+
+#: build/trans_presets.java:464
+msgid "grade5"
+msgstr "第五级"
+
+#: build/trans_presets.java:466 build/trans_presets.java:489
+msgid "MTB Scale"
+msgstr "MTB 比例"
+
+#. item "Ways/Track" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:479
+msgid "Path"
+msgstr "小径"
+
+#. item "Ways/Path"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
+#: build/trans_presets.java:482
+msgid "Edit Path"
+msgstr "编辑小径"
+
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:487
+msgid "SAC Scale"
+msgstr "SAC 比例"
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:487 build/trans_presets.java:3266
+msgid "hiking"
+msgstr "健行"
+
+#: build/trans_presets.java:487
+msgid "mountain_hiking"
+msgstr "登山"
+
+#: build/trans_presets.java:487
+msgid "demanding_mountain_hiking"
+msgstr "费力的登山"
+
+#: build/trans_presets.java:487
+msgid "alpine_hiking"
+msgstr "高山登山"
+
+#: build/trans_presets.java:487
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:487
+msgid "difficult_alpine_hiking"
+msgstr ""
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:490
+msgid "excellent"
+msgstr "极好"
+
+#: build/trans_presets.java:490
+msgid "good"
+msgstr "良好"
+
+#: build/trans_presets.java:490 build/trans_presets.java:2058
+msgid "intermediate"
+msgstr "中级"
+
+#: build/trans_presets.java:490
+msgid "bad"
+msgstr "差"
+
+#: build/trans_presets.java:490
+msgid "horrible"
+msgstr "恐怖的"
+
+#: build/trans_presets.java:499
+msgid "Wheelchairs"
+msgstr "轮椅"
+
+#: build/trans_presets.java:500
+msgid "Ski"
+msgstr "滑雪"
+
+#: build/trans_presets.java:501
+msgid "Snowmobile"
+msgstr "雪上摩托车"
+
+#. item "Ways/Path" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:509
+msgid "Dedicated Bridleway"
+msgstr "专用马道"
+
+#. item "Ways/Dedicated Bridleway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
+#: build/trans_presets.java:511
+msgid "Edit Bridleway"
+msgstr "编辑马道"
+
+#. item "Ways/Dedicated Bridleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:527
+msgid "Dedicated Cycleway"
+msgstr "专用自行车道"
+
+#. item "Ways/Dedicated Cycleway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#. item "Ways/Segregated Foot- and Cycleway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#. item "Ways/Combined Foot- and Cycleway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#: build/trans_presets.java:531 build/trans_presets.java:551
+#: build/trans_presets.java:573
+msgid "Edit Cycleway"
+msgstr "编辑自行车道"
+
+#. item "Ways/Dedicated Cycleway" check "Embankment"
+#: build/trans_presets.java:542
+msgid "Pedestrians"
+msgstr "行人"
+
+#. item "Ways/Dedicated Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:547
+msgid "Segregated Foot- and Cycleway"
+msgstr "分离的步行与自行车道"
+
+#. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:569
+msgid "Combined Foot- and Cycleway"
+msgstr "合并的步行与自行车道"
+
+#. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:592
+msgid "Dedicated Footway"
+msgstr "专用人行步道"
+
+#. item "Ways/Dedicated Footway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
+#: build/trans_presets.java:595
+msgid "Edit Footway"
+msgstr "编辑人行步道"
+
+#. item "Ways/Dedicated Footway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:610
+msgid "Steps"
+msgstr "楼梯"
+
+#. item "Ways/Steps"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
+#: build/trans_presets.java:614
+msgid "Edit Flight of Steps"
+msgstr "编辑楼梯"
+
+#. group "Waypoints"
+#: build/trans_presets.java:631
+msgid "Motorway Junction"
+msgstr "高速公路出口"
+
+#. item "Waypoints/Motorway Junction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
+#: build/trans_presets.java:633
+msgid "Edit Motorway Junction"
+msgstr "编辑高速公路出口"
+
+#. item "Waypoints/Motorway Junction" text "Name"
+#: build/trans_presets.java:637
+msgid "Number"
+msgstr "编号"
+
+#. item "Waypoints/Motorway Junction" text "Number"
+#: build/trans_presets.java:639
+msgid "Services"
+msgstr "服务站"
+
+#. item "Waypoints/Services"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
+#: build/trans_presets.java:641
+msgid "Edit Service Station"
+msgstr "编辑服务站"
+
+#. item "Waypoints/Services" text "Name"
+#. item "Barriers/Toll Booth" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Tourism/Information Terminal" text "Closer description"
+#. item "Tourism/Audioguide" text "Closer description"
+#. item "Man-Made/Buildings/Post Office" text "Name"
+#. item "Man Made/Tower" text "Height (meters)"
+#. item "Man Made/Pipeline" label "Edit Pipeline"
+#. <key key="man_made" value="pipeline" />
+#. item "Man Made/Power Station" text "Name"
+#. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
+#. <key key="power" value="sub_station" />
+#. item "Amenities/Toilets"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets" />
+#. <key key="amenity" value="toilets" />
+#. item "Amenities/Post Box"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
+#. <key key="amenity" value="post_box" />
+#. item "Amenities/Telephone" label "Edit Telephone"
+#. <key key="amenity" value="telephone" />
+#. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
+#. <key key="amenity" value="baby_hatch" />
+#. item "Shops/Car Dealer" text "Name"
+#. item "Cash/Bank" text "Name"
+#. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
+#. <key key="amenity" value="atm" />
+#. item "Health/Emergency Access Point" text "Point Name"
+#. item "Relations/Route" text "Network"
+#: build/trans_presets.java:646 build/trans_presets.java:799
+#: build/trans_presets.java:1339 build/trans_presets.java:1382
+#: build/trans_presets.java:1388 build/trans_presets.java:1396
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
+msgid "Operator"
+msgstr "经营者"
+
+#. item "Waypoints/Services" text "Operator"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:650
+msgid "Traffic Signal"
+msgstr "信号灯"
+
+#. item "Waypoints/Traffic Signal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals" />
+#. <key key="highway" value="traffic_signals" />
+#. <optional>
+#: build/trans_presets.java:654
+msgid "Pedestrian crossing type"
+msgstr "人行横道类型"
+
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
+#. item "Waypoints/Pedestrian Crossing" combo "Type"
+#. item "Transport/Railway/Crossing" combo "Crossing type"
+#: build/trans_presets.java:654 build/trans_presets.java:669
+#: build/trans_presets.java:1278
+msgid "uncontrolled"
+msgstr "没有信号灯"
+
+#: build/trans_presets.java:654 build/trans_presets.java:669
+#: build/trans_presets.java:1278
+msgid "traffic_signals"
+msgstr "信号灯"
+
+#: build/trans_presets.java:654 build/trans_presets.java:669
+#: build/trans_presets.java:1278
+msgid "island"
+msgstr "安全岛"
+
+#: build/trans_presets.java:654 build/trans_presets.java:669
+#: build/trans_presets.java:1278
+msgid "unmarked"
+msgstr "未画标记"
+
+#. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
+#: build/trans_presets.java:655 build/trans_presets.java:671
+#: build/trans_presets.java:1279
+msgid "Cross on horseback"
+msgstr "骑马穿越"
+
+#. item "Waypoints/Traffic Signal" check "Cross on horseback"
+#. item "Transport/Railway/Crossing" check "Cross on horseback"
+#: build/trans_presets.java:656 build/trans_presets.java:670
+#: build/trans_presets.java:1280
+msgid "Cross by bicycle"
+msgstr "以自行车穿越"
+
+#. item "Waypoints/Traffic Signal" check "Cross by bicycle"
+#. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
+#. item "Transport/Railway/Crossing" check "Cross by bicycle"
+#: build/trans_presets.java:657 build/trans_presets.java:672
+#: build/trans_presets.java:1281
+msgid "Crossing attendant"
+msgstr "有人陪同穿越"
+
+#. item "Waypoints/Traffic Signal" check "Crossing attendant"
+#: build/trans_presets.java:658
+msgid "Crossing type name (UK)"
+msgstr "人行横道类型名称 (英国)"
+
+#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
+#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
+#: build/trans_presets.java:658 build/trans_presets.java:673
+msgid "zebra"
+msgstr "斑马线"
+
+#: build/trans_presets.java:658 build/trans_presets.java:673
+msgid "pelican"
+msgstr ""
+
+#: build/trans_presets.java:658 build/trans_presets.java:673
+msgid "toucan"
+msgstr ""
+
+#: build/trans_presets.java:658 build/trans_presets.java:673
+msgid "puffin"
+msgstr ""
+
+#: build/trans_presets.java:658 build/trans_presets.java:673
+msgid "pegasus"
+msgstr ""
+
+#: build/trans_presets.java:658 build/trans_presets.java:673
+msgid "tiger"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:661
+msgid "Stop"
+msgstr "禁止通行"
+
+#. item "Waypoints/Stop"
+#. <key key="highway" value="stop" />
+#: build/trans_presets.java:664
+msgid "Pedestrian Crossing"
+msgstr "人行横道"
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:667
+msgid "Edit Crossing"
+msgstr "编辑人行横道"
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:673
+msgid "Type name (UK)"
+msgstr "类型名称 (英国)"
+
+#: build/trans_presets.java:675
+msgid "Traffic Calming"
+msgstr "道路减速设施"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:677
+msgid "Edit Traffic Calming"
+msgstr "编辑道路减速设施"
+
+#: build/trans_presets.java:678
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:678
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:678
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:678
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:678
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:678
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:680
+msgid "Passing Place"
+msgstr "让车处"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:682
+msgid "Edit Passing Place"
+msgstr "编辑让车处"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:685
+msgid "Mini-roundabout"
+msgstr "小型环岛"
+
+#. item "Waypoints/Mini-roundabout"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
+#. <key key="highway" value="mini_roundabout" />
+#: build/trans_presets.java:690
+msgid "Direction"
+msgstr "方向"
+
+#. item "Waypoints/Mini-roundabout" combo "Direction"
+#: build/trans_presets.java:690
+msgid "clockwise"
+msgstr "顺时针"
+
+#: build/trans_presets.java:692
+msgid "Turning Circle"
+msgstr "回旋圈"
+
+#. item "Waypoints/Turning Circle"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
+#. <key key="highway" value="turning_circle" />
+#: build/trans_presets.java:697
+msgid "City Limit"
+msgstr "城市边界"
+
+#. item "Waypoints/City Limit"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:699
+msgid "Edit City Limit Sign"
+msgstr "编辑城市边界标志"
+
+#. item "Waypoints/City Limit" text "Name"
+#: build/trans_presets.java:704
+msgid "Second Name"
+msgstr "第二名称"
+
+#. item "Waypoints/City Limit" text "Second Name"
+#: build/trans_presets.java:706
+msgid "Speed Camera"
+msgstr "测速照相"
+
+#. item "Waypoints/Speed Camera"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
+#. <key key="highway" value="speed_camera" />
+#: build/trans_presets.java:710
+msgid "Emergency Phone"
+msgstr "紧急电话"
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
+#: build/trans_presets.java:713
+msgid "Incline"
+msgstr "坡"
+
+#. item "Waypoints/Incline"
+#. <key key="highway" value="incline" />
+#: build/trans_presets.java:716
+msgid "Incline Steep"
+msgstr "险升/降坡"
+
+#. item "Waypoints/Incline Steep"
+#. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:719
+msgid "Grit Bin"
+msgstr ""
+
+#. item "Waypoints/Grit Bin"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
+#. <key key="amenity" value="grit_bin" />
+#. <separator/>
+#: build/trans_presets.java:724
+msgid "Ford"
+msgstr "浅滩"
+
+#. item "Waypoints/Ford"
+#: build/trans_presets.java:725
+msgid "Edit Ford"
+msgstr "编辑浅滩"
+
+#. item "Waypoints/Ford" text "Name"
+#. </optional>
+#: build/trans_presets.java:732
+msgid "Mountain Pass"
+msgstr "隘口"
+
+#. item "Waypoints/Mountain Pass"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
+#: build/trans_presets.java:734
+msgid "Edit Mountain Pass"
+msgstr "编辑隘口"
+
+#. item "Waypoints/Mountain Pass" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost" text "Name"
+#. item "Geography/Places/Peak" text "Name"
+#. item "Geography/Places/Glacier" text "Name"
+#. item "Geography/Places/Volcano" text "Name"
+#: build/trans_presets.java:739 build/trans_presets.java:1625
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
+msgid "Elevation"
+msgstr "海拔"
+
+#. item "Waypoints/Mountain Pass" text "Elevation"
+#. </optional>
+#: build/trans_presets.java:743
+msgid "Barriers"
+msgstr "障碍物"
+
+#. group "Barriers"
+#. <!-- *** node barriers *** -->
+#: build/trans_presets.java:746
+msgid "Bollard"
+msgstr "车阻柱"
+
+#. item "Barriers/Bollard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:748
+msgid "Edit Bollard"
+msgstr "编辑车阻柱"
+
+#. item "Barriers/Bollard" label "Edit Bollard"
+#. <space />
+#. <key key="barrier" value="bollard" />
+#. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
+#. <space />
+#. <key key="barrier" value="cattle_grid" />
+#. item "Barriers/Spikes" label "Edit Spikes"
+#. <space />
+#. <key key="barrier" value="spikes" />
+#. item "Barriers/Border Control" label "Edit Border Control"
+#. <space />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
+#. item "Barriers/Gate" label "Edit Gate"
+#. <space />
+#. <key key="barrier" value="gate" />
+#. item "Barriers/Lift Gate" label "Edit Lift Gate"
+#. <space />
+#. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
+#. item "Barriers/Sally Port" label "Edit Sally Port"
+#. <space />
+#. <key key="barrier" value="sally_port" />
+#: build/trans_presets.java:751 build/trans_presets.java:770
+#: build/trans_presets.java:784 build/trans_presets.java:806
+#: build/trans_presets.java:843 build/trans_presets.java:856
+#: build/trans_presets.java:868 build/trans_presets.java:880
+#: build/trans_presets.java:892 build/trans_presets.java:904
+#: build/trans_presets.java:914 build/trans_presets.java:923
+#: build/trans_presets.java:932
+msgid "Allowed traffic:"
+msgstr "允许通行方向："
+
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:758
+msgid "Cycle Barrier"
+msgstr "自行车护栏"
+
+#. item "Barriers/Cycle Barrier"
+#. <link href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:762
+msgid "Block"
+msgstr "水泥护栏"
+
+#. item "Barriers/Block"
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:765
+msgid "Cattle Grid"
+msgstr "家畜栅栏"
+
+#. item "Barriers/Cattle Grid"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:767
+msgid "Edit Cattle Grid"
+msgstr "编辑家畜栅栏"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:777
+msgid "Bus Trap"
+msgstr "公交车专用道障碍"
+
+#. item "Barriers/Bus Trap"
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:780
+msgid "Spikes"
+msgstr "长钉"
+
+#. item "Barriers/Spikes"
+#: build/trans_presets.java:781
+msgid "Edit Spikes"
+msgstr "编辑长钉"
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:792
+msgid "Toll Booth"
+msgstr "收费站"
+
+#. item "Barriers/Toll Booth"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:794
+msgid "Edit Toll Booth"
+msgstr "编辑收费站"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:802
+msgid "Border Control"
+msgstr "国境管控站"
+
+#. item "Barriers/Border Control"
+#: build/trans_presets.java:803
+msgid "Edit Border Control"
+msgstr "编辑国境管控站"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:817
+msgid "Hedge"
+msgstr "篱笆"
+
+#. item "Barriers/Hedge"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:821 build/trans_presets.java:823
+msgid "Fence"
+msgstr "栏栅"
+
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:823
+msgid "fence"
+msgstr "栏栅"
+
+#: build/trans_presets.java:823
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:823
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:825
+msgid "Wall"
+msgstr "墙"
+
+#. item "Barriers/Wall"
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:828
+msgid "City Wall"
+msgstr "城墙"
+
+#. item "Barriers/City Wall"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:832
+msgid "Retaining Wall"
+msgstr "挡土墙"
+
+#. item "Barriers/Retaining Wall"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#. <!-- *** access *** -->
+#: build/trans_presets.java:839
+msgid "Entrance"
+msgstr "入口"
+
+#. item "Barriers/Entrance"
+#: build/trans_presets.java:840
+msgid "Edit Entrance"
+msgstr "编辑入口"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:851 build/trans_presets.java:1580
+msgid "Gate"
+msgstr "闸门"
+
+#. item "Barriers/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:853
+msgid "Edit Gate"
+msgstr "编辑闸门"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:864
+msgid "Lift Gate"
+msgstr ""
+
+#. item "Barriers/Lift Gate"
+#: build/trans_presets.java:865
+msgid "Edit Lift Gate"
+msgstr ""
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate"
+#: build/trans_presets.java:877
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:888
+msgid "Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate"
+#: build/trans_presets.java:889
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:900
+msgid "Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate"
+#: build/trans_presets.java:901
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:909
+msgid "Stile"
+msgstr "栅栏台阶"
+
+#. item "Barriers/Stile"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:911
+msgid "Edit Stile"
+msgstr "编辑栅栏台阶"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:919
+msgid "Turnstile"
+msgstr "旋转栅门"
+
+#. item "Barriers/Turnstile"
+#: build/trans_presets.java:920
+msgid "Edit Turnstile"
+msgstr "编辑旋转栅门"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:928
+msgid "Sally Port"
+msgstr "城门"
+
+#. item "Barriers/Sally Port"
+#: build/trans_presets.java:929
+msgid "Edit Sally Port"
+msgstr "编辑城门"
+
+#. item "Barriers/Sally Port" check "Motorcar"
+#. group "Water"
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:943 build/trans_presets.java:944
+#: build/trans_presets.java:995
+msgid "Water"
+msgstr "水域"
+
+#. group "Water/Water"
+#: build/trans_presets.java:945
+msgid "Spring"
+msgstr "泉"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:947
+msgid "Edit Spring"
+msgstr "编辑泉"
+
+#. item "Water/Water/Spring" text "Name"
+#. <separator/>
+#: build/trans_presets.java:952
+msgid "Drain"
+msgstr ""
+
+#. item "Water/Water/Drain"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
+#: build/trans_presets.java:954
+msgid "Edit Drain"
+msgstr ""
+
+#. item "Water/Water/Drain" combo "Layer"
+#: build/trans_presets.java:960
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:962
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:968
+msgid "Stream"
+msgstr "溪流"
+
+#. item "Water/Water/Stream"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
+#: build/trans_presets.java:970
+msgid "Edit Stream"
+msgstr "编辑溪流"
+
+#. item "Water/Water/Stream" combo "Layer"
+#: build/trans_presets.java:976
+msgid "Canal"
+msgstr "运河"
+
+#. item "Water/Water/Canal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
+#: build/trans_presets.java:978
+msgid "Edit Canal"
+msgstr "编辑运河"
+
+#. item "Water/Water/Canal" combo "Layer"
+#: build/trans_presets.java:984
+msgid "River"
+msgstr "河流"
+
+#. item "Water/Water/River"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
+#: build/trans_presets.java:988
+msgid "Edit River"
+msgstr "编辑河流"
+
+#. item "Water/Water/Water"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
+#: build/trans_presets.java:997
+msgid "Edit Water"
+msgstr "编辑水域"
+
+#. item "Water/Water/Water" text "Name"
+#: build/trans_presets.java:1001
+msgid "Land"
+msgstr "陆地"
+
+#. item "Water/Water/Land"
+#: build/trans_presets.java:1002
+msgid "Edit Land"
+msgstr "编辑陆地"
+
+#. item "Water/Water/Land" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1007
+msgid "Basin"
+msgstr ""
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1008
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1013
+msgid "Reservoir"
+msgstr "贮水处"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1015
+msgid "Edit Reservoir Landuse"
+msgstr "编辑贮水处"
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1020
+msgid "Covered Reservoir"
+msgstr "有覆盖的贮水处"
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1021
+msgid "Edit Covered Reservoir"
+msgstr "编辑有覆盖的贮水处"
+
+#. item "Water/Water/Covered Reservoir" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1026
+msgid "Riverbank"
+msgstr "河岸"
+
+#. item "Water/Water/Riverbank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
+#: build/trans_presets.java:1029
+msgid "Edit Riverbank"
+msgstr "编辑河岸"
+
+#. item "Water/Water/Riverbank" text "Name"
+#: build/trans_presets.java:1033
+msgid "Wetland"
+msgstr "湿地"
+
+#. item "Water/Water/Wetland"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
+#. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
+#. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
+#: build/trans_presets.java:1038
+msgid "Edit Wetland"
+msgstr "编辑湿地"
+
+#. item "Water/Water/Wetland" combo "Type"
+#: build/trans_presets.java:1041
+msgid "swamp"
+msgstr "沼泽"
+
+#: build/trans_presets.java:1041
+msgid "bog"
+msgstr "泥沼"
+
+#. color woodarea
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_presets.java:1041 build/trans_style.java:3525
+msgid "marsh"
+msgstr ""
+
+#: build/trans_presets.java:1041
+msgid "reedbed"
+msgstr ""
+
+#: build/trans_presets.java:1041
+msgid "saltmarsh"
+msgstr ""
+
+#: build/trans_presets.java:1041
+msgid "tidalflat"
+msgstr ""
+
+#: build/trans_presets.java:1041
+msgid "mangrove"
+msgstr "红树林"
+
+#: build/trans_presets.java:1043
+msgid "Mud"
+msgstr ""
+
+#. item "Water/Water/Mud"
+#: build/trans_presets.java:1044
+msgid "Edit Mud"
+msgstr ""
+
+#. item "Water/Water/Mud" text "Name"
+#: build/trans_presets.java:1048
+msgid "Beach"
+msgstr "海滩"
+
+#. item "Water/Water/Beach"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
+#: build/trans_presets.java:1050
+msgid "Edit Beach"
+msgstr "编辑海滩"
+
+#. item "Water/Water/Beach" text "Name"
+#: build/trans_presets.java:1054
+msgid "Bay"
+msgstr "海湾"
+
+#. item "Water/Water/Bay"
+#: build/trans_presets.java:1055
+msgid "Edit Bay"
+msgstr "编辑海湾"
+
+#. item "Water/Water/Bay" text "Name"
+#: build/trans_presets.java:1059
+msgid "Cliff"
+msgstr "断崖"
+
+#. item "Water/Water/Cliff"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
+#: build/trans_presets.java:1061
+msgid "Edit Cliff"
+msgstr "编辑断崖"
+
+#. item "Water/Water/Cliff" text "Name"
+#: build/trans_presets.java:1065
+msgid "Coastline"
+msgstr "海岸线"
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1067
+msgid "Edit Coastline"
+msgstr "编辑海岸线"
+
+#. item "Water/Water/Coastline" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1072
+msgid "Ferry Route"
+msgstr "渡轮路线"
+
+#. item "Water/Water/Ferry Route"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
+#: build/trans_presets.java:1074
+msgid "Edit Ferry"
+msgstr "编辑渡轮"
+
+#. item "Water/Water/Ferry Route" text "Name"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1082
+msgid "Boatyard"
+msgstr ""
+
+#. item "Water/Water/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
+#: build/trans_presets.java:1084
+msgid "Edit Boatyard"
+msgstr ""
+
+#. item "Water/Water/Boatyard" text "Name"
+#: build/trans_presets.java:1089
+msgid "Dock"
+msgstr "船坞"
+
+#. item "Water/Water/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1091
+msgid "Edit Dock"
+msgstr "编辑船坞"
+
+#. item "Water/Water/Dock" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1097
+msgid "Dam"
+msgstr "水坝"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1099
+msgid "Edit Dam"
+msgstr "编辑水坝"
+
+#. item "Water/Water/Dam" text "Name"
+#: build/trans_presets.java:1105
+msgid "Waterway Point"
+msgstr "水路点"
+
+#. group "Waterway Point"
+#: build/trans_presets.java:1106
+msgid "Lock Gate"
+msgstr "调节水门"
+
+#. item "Waterway Point/Lock Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
+#. <key key="waterway" value="lock_gate" />
+#: build/trans_presets.java:1110
+msgid "Weir"
+msgstr "堰"
+
+#. item "Waterway Point/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1112
+msgid "Edit Weir"
+msgstr "编辑堰"
+
+#. item "Waterway Point/Weir" text "Name"
+#: build/trans_presets.java:1117
+msgid "Waterfall"
+msgstr "瀑布"
+
+#. item "Waterway Point/Waterfall"
+#: build/trans_presets.java:1118
+msgid "Edit Waterfall"
+msgstr "编辑瀑布"
+
+#. item "Waterway Point/Waterfall" text "Name"
+#: build/trans_presets.java:1123
+msgid "Turning Point"
+msgstr ""
+
+#. item "Waterway Point/Turning Point"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
+#. <key key="waterway" value="turning_point" />
+#: build/trans_presets.java:1127
+msgid "Marina"
+msgstr "码头"
+
+#. item "Waterway Point/Marina"
+#: build/trans_presets.java:1128
+msgid "Edit Marina"
+msgstr "编辑码头"
+
+#. item "Waterway Point/Marina" text "Name"
+#: build/trans_presets.java:1132
+msgid "Pier"
+msgstr "渡头"
+
+#. item "Waterway Point/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1134
+msgid "Edit Pier"
+msgstr "编辑渡头"
+
+#. item "Waterway Point/Pier" text "Name"
+#: build/trans_presets.java:1138
+msgid "Ferry Terminal"
+msgstr "渡轮端点"
+
+#. item "Waterway Point/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1140
+msgid "Edit Ferry Terminal"
+msgstr "编辑渡轮端点"
+
+#. item "Waterway Point/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1144
+msgid "Slipway"
+msgstr "船台"
+
+#. item "Waterway Point/Slipway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
+#: build/trans_presets.java:1148
+msgid "Edit Slipway"
+msgstr "编辑造船台"
+
+#. item "Waterway Point/Slipway" text "Name"
+#: build/trans_presets.java:1154
+msgid "Transport"
+msgstr "运输"
+
+#. group "Transport"
+#: build/trans_presets.java:1155
+msgid "Railway"
+msgstr "铁路"
+
+#. group "Transport/Railway"
+#: build/trans_presets.java:1156
+msgid "Rail"
+msgstr "轨道"
+
+#. item "Transport/Railway/Rail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
+#: build/trans_presets.java:1158
+msgid "Edit Rail"
+msgstr "编辑轨道"
+
+#. item "Transport/Railway/Rail" label "Edit Rail"
+#. <space />
+#. <key key="railway" value="rail" />
+#. <optional>
+#. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
+#. <space />
+#. <key key="railway" value="narrow_gauge" />
+#. <optional>
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
+#. <space />
+#. <key key="railway" value="preserved" />
+#. <optional>
+#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
+#. <space />
+#. <key key="railway" value="light_rail" />
+#. <optional>
+#. item "Transport/Railway/Subway" label "Edit Subway"
+#. <space />
+#. <key key="railway" value="subway" />
+#. <optional>
+#. item "Transport/Railway/Tram" label "Edit Tram"
+#. <space />
+#. <key key="railway" value="tram" />
+#. <optional>
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1198 build/trans_presets.java:1210
+#: build/trans_presets.java:1222 build/trans_presets.java:1234
+msgid "Gauge (mm)"
+msgstr "轨距 (mm)"
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
+#. item "Transport/Railway/Monorail" label "Edit Monorail"
+#. <space />
+#. <key key="railway" value="monorail" />
+#. <optional>
+#. item "Transport/Railway/Preserved" combo "Gauge (mm)"
+#. item "Transport/Railway/Light Rail" combo "Gauge (mm)"
+#. item "Transport/Railway/Subway" combo "Gauge (mm)"
+#. item "Transport/Railway/Tram" combo "Gauge (mm)"
+#: build/trans_presets.java:1163 build/trans_presets.java:1175
+#: build/trans_presets.java:1187 build/trans_presets.java:1199
+#: build/trans_presets.java:1211 build/trans_presets.java:1223
+#: build/trans_presets.java:1235
+msgid "Types"
+msgstr "类型"
+
+#. item "Transport/Railway/Rail" combo "Types"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Types"
+#. item "Transport/Railway/Monorail" combo "Types"
+#. item "Transport/Railway/Preserved" combo "Types"
+#. item "Transport/Railway/Light Rail" combo "Types"
+#. item "Transport/Railway/Subway" combo "Types"
+#. item "Transport/Railway/Tram" combo "Types"
+#. item "Transport/Railway/Disused Rail" combo "Optional Types"
+#: build/trans_presets.java:1163 build/trans_presets.java:1175
+#: build/trans_presets.java:1187 build/trans_presets.java:1199
+#: build/trans_presets.java:1211 build/trans_presets.java:1223
+#: build/trans_presets.java:1235 build/trans_presets.java:1264
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1163 build/trans_presets.java:1175
+#: build/trans_presets.java:1187 build/trans_presets.java:1199
+#: build/trans_presets.java:1211 build/trans_presets.java:1223
+#: build/trans_presets.java:1235 build/trans_presets.java:1264
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1163 build/trans_presets.java:1175
+#: build/trans_presets.java:1187 build/trans_presets.java:1199
+#: build/trans_presets.java:1211 build/trans_presets.java:1223
+#: build/trans_presets.java:1235 build/trans_presets.java:1264
+msgid "spur"
+msgstr "支线"
+
+#: build/trans_presets.java:1164 build/trans_presets.java:1176
+#: build/trans_presets.java:1188 build/trans_presets.java:1200
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236
+msgid "Electrified"
+msgstr "电气化"
+
+#. item "Transport/Railway/Rail" combo "Electrified"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Electrified"
+#. item "Transport/Railway/Monorail" combo "Electrified"
+#. item "Transport/Railway/Preserved" combo "Electrified"
+#. item "Transport/Railway/Light Rail" combo "Electrified"
+#. item "Transport/Railway/Subway" combo "Electrified"
+#. item "Transport/Railway/Tram" combo "Electrified"
+#: build/trans_presets.java:1164 build/trans_presets.java:1176
+#: build/trans_presets.java:1188 build/trans_presets.java:1200
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236
+msgid "contact_line"
+msgstr "接触网"
+
+#. color foot
+#. <icon annotate="true" src="transport/steps.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bus_guideway"/>
+#. color railwaypoint
+#. <icon annotate="true" src="vehicle/crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="rail"/>
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="narrow_gauge"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="monorail"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="turntable"/>
+#. <icon annotate="true" src="transport/turntable.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color rail
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="funicular"/>
+#: build/trans_presets.java:1164 build/trans_presets.java:1176
+#: build/trans_presets.java:1188 build/trans_presets.java:1200
+#: build/trans_presets.java:1212 build/trans_presets.java:1224
+#: build/trans_presets.java:1236 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
+msgid "rail"
+msgstr "第三轨"
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1165 build/trans_presets.java:1177
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
+msgid "Voltage"
+msgstr "电压"
+
+#. item "Transport/Railway/Rail" combo "Voltage"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Voltage"
+#. item "Transport/Railway/Monorail" combo "Voltage"
+#. item "Transport/Railway/Preserved" combo "Voltage"
+#. item "Transport/Railway/Light Rail" combo "Voltage"
+#. item "Transport/Railway/Subway" combo "Voltage"
+#. item "Transport/Railway/Tram" combo "Voltage"
+#: build/trans_presets.java:1166 build/trans_presets.java:1178
+#: build/trans_presets.java:1190 build/trans_presets.java:1202
+#: build/trans_presets.java:1214 build/trans_presets.java:1226
+#: build/trans_presets.java:1238
+msgid "Frequency (Hz)"
+msgstr "频率 (Hz)"
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1166 build/trans_presets.java:1178
+#: build/trans_presets.java:1190 build/trans_presets.java:1202
+#: build/trans_presets.java:1214 build/trans_presets.java:1226
+#: build/trans_presets.java:1238
+msgid "16.7"
+msgstr "16.7"
+
+#. </optional>
+#: build/trans_presets.java:1169
+msgid "Narrow Gauge Rail"
+msgstr "窄轨"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1170
+msgid "Edit Narrow Gauge Rail"
+msgstr "编辑窄轨"
+
+#. </optional>
+#: build/trans_presets.java:1181
+msgid "Monorail"
+msgstr "单轨"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1183
+msgid "Edit Monorail"
+msgstr "编辑单轨"
+
+#. </optional>
+#: build/trans_presets.java:1193
+msgid "Preserved"
+msgstr "保留铁路"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1194
+msgid "Edit Preserved Railway"
+msgstr "编辑保留的铁路"
+
+#. </optional>
+#: build/trans_presets.java:1205
+msgid "Light Rail"
+msgstr "轻轨"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1206
+msgid "Edit Light Rail"
+msgstr "编辑轻轨"
+
+#. </optional>
+#: build/trans_presets.java:1217
+msgid "Subway"
+msgstr "地铁"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1218
+msgid "Edit Subway"
+msgstr "编辑地铁"
+
+#. </optional>
+#: build/trans_presets.java:1229
+msgid "Tram"
+msgstr "有轨电车"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1230
+msgid "Edit Tram"
+msgstr "编辑有轨电车"
+
+#. </optional>
+#: build/trans_presets.java:1241
+msgid "Bus Guideway"
+msgstr "导轨巴士"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1243
+msgid "Edit Bus Guideway"
+msgstr "编辑导轨巴士"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1260
+msgid "Disused Rail"
+msgstr "不使用的轨道"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1261
+msgid "Edit Disused Railway"
+msgstr "编辑不使用的铁路"
+
+#. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
+#. <space />
+#. <key key="railway" value="disused" />
+#: build/trans_presets.java:1264
+msgid "Optional Types"
+msgstr "选择性的类型"
+
+#: build/trans_presets.java:1266
+msgid "Abandoned Rail"
+msgstr "废弃的轨道"
+
+#. item "Transport/Railway/Abandoned Rail"
+#. <key key="railway" value="abandoned" />
+#. <separator/>
+#: build/trans_presets.java:1270
+msgid "Level Crossing"
+msgstr "铁路平交道"
+
+#. item "Transport/Railway/Level Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
+#. <key key="railway" value="level_crossing" />
+#: build/trans_presets.java:1274
+msgid "Crossing"
+msgstr "平交道"
+
+#. item "Transport/Railway/Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
+#. <key key="railway" value="crossing" />
+#. <optional>
+#: build/trans_presets.java:1278
+msgid "Crossing type"
+msgstr "平交道类型"
+
+#. item "Transport/Railway/Crossing" check "Crossing attendant"
+#. </optional>
+#: build/trans_presets.java:1284
+msgid "Turntable"
+msgstr "调车转盘"
+
+#. item "Transport/Railway/Turntable"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
+#. <key key="railway" value="turntable" />
+#: build/trans_presets.java:1288
+msgid "Buffer Stop"
+msgstr ""
+
+#. item "Transport/Railway/Buffer Stop"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
+#. <key key="railway" value="buffer_stop" />
+#: build/trans_presets.java:1293
+msgid "Aerialway"
+msgstr "空中路线"
+
+#. group "Aerialway"
+#: build/trans_presets.java:1294
+msgid "Chair Lift"
+msgstr "滑雪缆车"
+
+#. item "Aerialway/Chair Lift"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
+#: build/trans_presets.java:1296
+msgid "Edit Chair Lift"
+msgstr "编辑滑雪缆车"
+
+#. item "Aerialway/Chair Lift" text "Name"
+#: build/trans_presets.java:1300
+msgid "Drag Lift"
+msgstr ""
+
+#. item "Aerialway/Drag Lift"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
+#: build/trans_presets.java:1302
+msgid "Edit Drag Lift"
+msgstr ""
+
+#. item "Aerialway/Drag Lift" text "Name"
+#: build/trans_presets.java:1306
+msgid "Cable Car"
+msgstr "缆车"
+
+#. item "Aerialway/Cable Car"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
+#: build/trans_presets.java:1308
+msgid "Edit Cable Car"
+msgstr "编辑缆车"
+
+#. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1312
+msgid "Gondola"
+msgstr ""
+
+#. item "Aerialway/Gondola"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1314
+msgid "Edit Gondola"
+msgstr ""
+
+#. item "Aerialway/Gondola" text "Name"
+#: build/trans_presets.java:1318
+msgctxt "aerialway"
+msgid "Station"
+msgstr "车站"
+
+#. item "Aerialway/Station"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Edit Station"
+msgstr "编辑车站"
+
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1324
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1326
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
+#. group "Car"
+#: build/trans_presets.java:1333
+msgid "Fuel"
+msgstr "加油站"
+
+#. item "Car/Fuel"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
+#: build/trans_presets.java:1337
+msgid "Edit Fuel"
+msgstr "编辑加油站"
+
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1339
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1339
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Biergarten" text "Name"
+#. item "Food+Drinks/Bar" text "Name"
+#. item "Food+Drinks/Nightclub" text "Name"
+#. item "Tourism/Attraction" text "Name"
+#. item "Tourism/Museum" text "Name"
+#. item "Tourism/Zoo" text "Name"
+#. item "Tourism/Theme Park" text "Name"
+#. item "Tourism/Information Office" text "Name"
+#. item "Historic Places/Ruins" text "Name"
+#. item "Historic Places/Archaeological Site" text "Name"
+#. item "Sports/Sport Facilities/Golf Course" text "Name"
+#. item "Sports/Sport Facilities/Miniature Golf" text "Name"
+#. item "Man-Made/Buildings/Library" text "Name"
+#. item "Amenities/Baby Hatch" text "Operator"
+#. item "Shops/Supermarket" text "Name"
+#. item "Shops/Chemist" text "Name"
+#. item "Shops/Convenience Store" text "Name"
+#. item "Shops/Kiosk" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
+#. item "Shops/Butcher" text "Name"
+#. item "Shops/Baker" text "Name"
+#. item "Shops/Florist" text "Name"
+#. item "Shops/Organic" text "Name"
+#. item "Shops/Alcohol" text "Name"
+#. item "Shops/Beverages" text "Name"
+#. item "Shops/Computer" text "Name"
+#. item "Shops/Electronics" text "Name"
+#. item "Shops/Hifi" text "Name"
+#. item "Shops/Furniture" text "Name"
+#. item "Shops/Garden Centre" text "Name"
+#. item "Shops/Hardware" text "Name"
+#. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Stationery" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Toys" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Cash/Bank" text "Operator"
+#. item "Cash/Money Exchange" text "Name"
+#. item "Health/Doctors" text "Name"
+#. item "Health/Dentist" text "Name"
+#. item "Health/Pharmacy" text "Name"
+#. item "Health/Veterinary" text "Name"
+#: build/trans_presets.java:1342 build/trans_presets.java:1646
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
+msgid "Opening Hours"
+msgstr "开放时间"
+
+#. item "Car/Fuel" combo "Opening Hours"
+#. item "Food+Drinks/Restaurant" combo "Opening Hours"
+#. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Cafe" combo "Opening Hours"
+#. item "Food+Drinks/Pub" combo "Opening Hours"
+#. item "Food+Drinks/Biergarten" combo "Opening Hours"
+#. item "Food+Drinks/Bar" combo "Opening Hours"
+#. item "Food+Drinks/Nightclub" combo "Opening Hours"
+#. item "Tourism/Museum" combo "Opening Hours"
+#. item "Tourism/Zoo" combo "Opening Hours"
+#. item "Tourism/Theme Park" combo "Opening Hours"
+#. item "Tourism/Information Office" combo "Opening Hours"
+#. item "Historic Places/Ruins" combo "Opening Hours"
+#. item "Historic Places/Archaeological Site" combo "Opening Hours"
+#. item "Sports/Sport Facilities/Golf Course" combo "Opening Hours"
+#. item "Sports/Sport Facilities/Miniature Golf" combo "Opening Hours"
+#. item "Man-Made/Buildings/Library" combo "Opening Hours"
+#. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
+#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Shops/Chemist" combo "Opening Hours"
+#. item "Shops/Convenience Store" combo "Opening Hours"
+#. item "Shops/Kiosk" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
+#. item "Shops/Butcher" combo "Opening Hours"
+#. item "Shops/Baker" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
+#. item "Shops/Organic" combo "Opening Hours"
+#. item "Shops/Alcohol" combo "Opening Hours"
+#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Computer" combo "Opening Hours"
+#. item "Shops/Electronics" combo "Opening Hours"
+#. item "Shops/Hifi" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Garden Centre" combo "Opening Hours"
+#. item "Shops/Hardware" combo "Opening Hours"
+#. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Stationery" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Toys" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Cash/Bank" combo "Opening Hours"
+#. item "Cash/Money Exchange" combo "Opening Hours"
+#. item "Health/Doctors" combo "Opening Hours"
+#. item "Health/Dentist" combo "Opening Hours"
+#. item "Health/Pharmacy" combo "Opening Hours"
+#. item "Health/Veterinary" combo "Opening Hours"
+#: build/trans_presets.java:1342 build/trans_presets.java:1646
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
+msgid "24/7"
+msgstr "24/7"
+
+#: build/trans_presets.java:1342 build/trans_presets.java:1646
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
+msgid "Mo-Fr 08:30-20:00"
+msgstr "周一-周五 08:30-20:00"
+
+#: build/trans_presets.java:1342 build/trans_presets.java:1646
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
+msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr "周二-周日 08:00-15:00; 周六 08:00-12:00"
+
+#: build/trans_presets.java:1343
+msgid "Fuel types:"
+msgstr "燃油类型："
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1344
+msgid "Diesel"
+msgstr "柴油"
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1345
+msgid "Bio Diesel"
+msgstr "生物柴油"
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1346
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1347
+msgid "Diesel for Heavy Good Vehicles"
+msgstr "重型货车用柴油"
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1348
+msgid "Octane 91"
+msgstr "91 号汽油"
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1349
+msgid "Octane 95"
+msgstr "95 号汽油"
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1350
+msgid "Octane 98"
+msgstr "98 号汽油"
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1351
+msgid "Octane 100"
+msgstr "100 号汽油"
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1352
+msgid "E10 (10% Ethanol mix)"
+msgstr "E10 (添加 10% 乙醇)"
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1353
+msgid "E85 (85% Ethanol mix)"
+msgstr "E85 (添加 85% 乙醇)"
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1354
+msgid "LPG (Liquefied petroleum gas)"
+msgstr "液化石油气"
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1355
+msgid "CNG (Compressed Natural Gas)"
+msgstr "压缩天然气"
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1356
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1357
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#: build/trans_presets.java:1358
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#. </optional>
+#. group "Bicycle"
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="village"/>
+#. <!--
+#. <action class="SetNodeAction" params=""/>
+#. <action class="AnnotationPresetAction" params="Places"/>
+#. -->
+#. </button>
+#: build/trans_presets.java:1361 build/trans_presets.java:1407
+#: build/trans_surveyor.java:24
+msgid "Parking"
+msgstr "停车场"
+
+#. item "Car/Parking"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
+#: build/trans_presets.java:1364
+msgid "Edit Parking"
+msgstr "编辑停车场"
+
+#. item "Car/Parking" text "Name"
+#. item "Tourism/Information Terminal" text "Operator"
+#. item "Tourism/Audioguide" text "Operator"
+#. item "Amenities/Toilets" text "Operator"
+#. item "Shops/Vending machine" text "Operator"
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
+msgid "Reference number"
+msgstr ""
+
+#. item "Car/Parking" combo "Type"
+#: build/trans_presets.java:1368
+msgid "multi-storey"
+msgstr "多层"
+
+#: build/trans_presets.java:1368
+msgid "surface"
+msgstr "平面"
+
+#. item "Man Made/Pipeline" combo "Location"
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
+msgid "underground"
+msgstr "地下"
+
+#: build/trans_presets.java:1369
+msgid "Park and Ride"
+msgstr "停车换乘"
+
+#. item "Tourism/Information Terminal" text "Reference number"
+#. item "Tourism/Audioguide" text "Reference number"
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+msgid "Fee"
+msgstr "费用"
+
+#. <space />
+#: build/trans_presets.java:1372
+msgid "Capacity (overall)"
+msgstr "容量 (整体)"
+
+#. item "Car/Parking" text "Capacity (overall)"
+#: build/trans_presets.java:1373
+msgid "Spaces for Disabled"
+msgstr "残障专用空间"
+
+#: build/trans_presets.java:1374
+msgid "Spaces for Women"
+msgstr "女性专用空间"
+
+#: build/trans_presets.java:1375
+msgid "Spaces for Parents"
+msgstr "父母专用空间"
+
+#: build/trans_presets.java:1376
+msgid "See the Wiki for other capacity:[types]=*."
+msgstr ""
+
+#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+#: build/trans_presets.java:1378
+msgid "Wash"
+msgstr "洗车场"
+
+#. item "Car/Wash"
+#: build/trans_presets.java:1379
+msgid "Edit Car Wash"
+msgstr "编辑"
+
+#. item "Car/Wash" text "Operator"
+#: build/trans_presets.java:1384
+msgid "Repair"
+msgstr "修车场"
+
+#. item "Car/Repair"
+#: build/trans_presets.java:1385
+msgid "Edit Car Repair"
+msgstr "编辑修车场"
+
+#. item "Car/Repair" text "Operator"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1390 build/trans_presets.java:1414
+msgid "Rental"
+msgstr "租车"
+
+#. item "Car/Rental"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
+#: build/trans_presets.java:1393
+msgid "Edit Car Rental"
+msgstr "编辑租车"
+
+#. item "Car/Rental" text "Operator"
+#: build/trans_presets.java:1398
+msgid "Sharing"
+msgstr ""
+
+#. item "Car/Sharing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
+#: build/trans_presets.java:1400
+msgid "Edit Car Sharing"
+msgstr ""
+
+#. item "Bicycle/Parking"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
+#: build/trans_presets.java:1409
+msgid "Edit Bicycle Parking"
+msgstr "编辑自行车停车场"
+
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1412
+msgid "Capacity"
+msgstr "容量"
+
+#. item "Bicycle/Rental"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
+#: build/trans_presets.java:1417
+msgid "Edit Bicycle Rental"
+msgstr "编辑自行车租用点"
+
+#. group "Public Transport"
+#: build/trans_presets.java:1423
+msgctxt "railway"
+msgid "Station"
+msgstr "车站"
+
+#. item "Public Transport/Station"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
+#: build/trans_presets.java:1426
+msgctxt "railway"
+msgid "Edit Station"
+msgstr "编辑车站"
+
+#. item "Public Transport/Station" text "Name"
+#: build/trans_presets.java:1431
+msgid "UIC-Reference"
+msgstr ""
+
+#. item "Public Transport/Station" text "UIC-Reference"
+#. </optional>
+#: build/trans_presets.java:1434
+msgid "Railway Halt"
+msgstr "铁路停靠站"
+
+#. item "Public Transport/Railway Halt"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
+#: build/trans_presets.java:1436
+msgid "Edit Halt"
+msgstr "编辑停靠站"
+
+#. item "Public Transport/Railway Halt" text "Name"
+#. </optional>
+#: build/trans_presets.java:1443
+msgid "Tram Stop"
+msgstr "有轨电车停靠站"
+
+#. item "Public Transport/Tram Stop"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
+#: build/trans_presets.java:1446
+msgid "Edit Tram Stop"
+msgstr "编辑有轨电车停靠站"
+
+#. item "Public Transport/Tram Stop" text "Name"
+#. </optional>
+#: build/trans_presets.java:1453
+msgid "Railway Platform"
+msgstr "铁路月台"
+
+#. item "Public Transport/Railway Platform"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
+#: build/trans_presets.java:1456
+msgid "Edit Railway Platform"
+msgstr "编辑铁路月台"
+
+#. item "Public Transport/Railway Platform" label "Edit Railway Platform"
+#. <key key="railway" value="platform" />
+#. <space />
+#. item "Public Transport/Bus Platform" label "Edit Bus Platform"
+#. <key key="highway" value="platform" />
+#. <space />
+#: build/trans_presets.java:1459 build/trans_presets.java:1504
+msgid "Reference (track number)"
+msgstr ""
+
+#. item "Public Transport/Railway Platform" text "Width (meters)"
+#. item "Public Transport/Bus Platform" text "Width (meters)"
+#: build/trans_presets.java:1461 build/trans_presets.java:1506
+msgid "Area"
+msgstr "区域"
+
+#. item "Public Transport/Railway Platform" check "Area"
+#: build/trans_presets.java:1463
+msgid "Subway Entrance"
+msgstr "地铁入口"
+
+#. item "Public Transport/Subway Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
+#: build/trans_presets.java:1466
+msgid "Edit Subway Entrance"
+msgstr "编辑地铁入口"
+
+#. item "Public Transport/Subway Entrance" text "Name"
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
+msgid "Wheelchair"
+msgstr "轮椅"
+
+#. item "Public Transport/Subway Entrance" check "Bicycle"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1476
+msgid "Bus Station"
+msgstr "公交车车站"
+
+#. item "Public Transport/Bus Station"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
+#: build/trans_presets.java:1479
+msgid "Edit Bus Station"
+msgstr "编辑公交车车站"
+
+#. item "Public Transport/Bus Station" text "Name"
+#. </optional>
+#: build/trans_presets.java:1485
+msgid "Bus Stop"
+msgstr "公交车停靠站"
+
+#. item "Public Transport/Bus Stop"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
+#: build/trans_presets.java:1489
+msgid "Edit Bus Stop"
+msgstr "编辑公交车停靠站"
+
+#. item "Public Transport/Bus Stop" text "Name"
+#. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
+msgid "Shelter"
+msgstr ""
+
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
+msgid "Bench"
+msgstr "长椅"
+
+#: build/trans_presets.java:1496
+msgid "Tactile Paving"
+msgstr "盲道"
+
+#. </optional>
+#: build/trans_presets.java:1500
+msgid "Bus Platform"
+msgstr "公交车月台"
+
+#. item "Public Transport/Bus Platform"
+#: build/trans_presets.java:1501
+msgid "Edit Bus Platform"
+msgstr "编辑公交车月台"
+
+#. item "Public Transport/Bus Platform" check "Area"
+#. <separator/>
+#: build/trans_presets.java:1509
+msgid "Taxi"
+msgstr "出租车"
+
+#. item "Public Transport/Taxi"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
+#: build/trans_presets.java:1511
+msgid "Edit Taxi station"
+msgstr "编辑出租车招呼站"
+
+#. item "Public Transport/Taxi" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1517
+msgid "Airport"
+msgstr "机场"
+
+#. group "Airport"
+#: build/trans_presets.java:1518
+msgid "Airport Ground"
+msgstr "机场地面"
+
+#. item "Airport/Airport Ground"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
+#: build/trans_presets.java:1520
+msgid "Edit Airport Ground"
+msgstr "编辑机场地面"
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1524
+msgid "IATA"
+msgstr "IATA"
+
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1525
+msgid "ICAO"
+msgstr "ICAO"
+
+#. item "Airport/Airport Ground" text "ICAO"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1529
+msgid "Runway"
+msgstr "跑道"
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1531
+msgid "Edit Runway"
+msgstr "编辑跑道"
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1537
+msgid "Taxiway"
+msgstr "滑行道"
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1539
+msgid "Edit Taxiway"
+msgstr "编辑滑行道"
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1545
+msgid "Helipad"
+msgstr "直升机停机坪"
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1547
+msgid "Edit Helipad"
+msgstr "编辑直升机停机坪"
+
+#. item "Airport/Helipad" text "Reference"
+#. </optional>
+#. item "Airport/Apron"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+msgid "Apron"
+msgstr "停机坪"
+
+#. item "Airport/Apron" label "Apron"
+#. <key key="aeroway" value="apron" />
+#. item "Airport/Hangar"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
+msgid "Hangar"
+msgstr "飞机库"
+
+#. item "Airport/Hangar" label "Hangar"
+#. <key key="building" value="hangar" />
+#. item "Airport/Beacon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
+#. item "Man Made/Crane" text "Name"
+#: build/trans_presets.java:1563 build/trans_presets.java:1565
+#: build/trans_presets.java:2399
+msgid "Beacon"
+msgstr "灯标"
+
+#. item "Airport/Beacon" label "Beacon"
+#. <key key="man_made" value="beacon" />
+#. item "Airport/Windsock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
+#: build/trans_presets.java:1568 build/trans_presets.java:1570
+msgid "Windsock"
+msgstr "风向袋"
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1574
+msgid "Terminal"
+msgstr "航站楼"
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1576
+msgid "Edit Terminal"
+msgstr "编辑航站楼"
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1582
+msgid "Edit Terminal Gate"
+msgstr "编辑登机口"
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1588
+msgid "Travel"
+msgstr "旅游"
+
+#. group "Travel"
+#: build/trans_presets.java:1589
+msgid "Accomodation"
+msgstr "住宿"
+
+#. group "Travel/Accomodation"
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
+#. <!--action class="SetNodeAction" params="amenity=fuel"/-->
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Fuel"/>
+#. </button>
+#: build/trans_presets.java:1590 build/trans_surveyor.java:43
+msgid "Hotel"
+msgstr "旅馆"
+
+#. item "Travel/Accomodation/Hotel"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
+#: build/trans_presets.java:1593
+msgid "Edit Hotel"
+msgstr "编辑旅馆"
+
+#. item "Travel/Accomodation/Hotel" text "Name"
+#: build/trans_presets.java:1596
+msgid "Stars"
+msgstr "星级"
+
+#. item "Travel/Accomodation/Hotel" combo "Stars"
+#: build/trans_presets.java:1598
+msgid "Motel"
+msgstr "汽车旅馆"
+
+#. item "Travel/Accomodation/Motel"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
+#: build/trans_presets.java:1600
+msgid "Edit Motel"
+msgstr "编辑汽车旅馆"
+
+#. item "Travel/Accomodation/Motel" text "Name"
+#: build/trans_presets.java:1604
+msgid "Guest House"
+msgstr ""
+
+#. item "Travel/Accomodation/Guest House"
+#: build/trans_presets.java:1605
+msgid "Edit Guest House"
+msgstr ""
+
+#. item "Travel/Accomodation/Guest House" text "Name"
+#: build/trans_presets.java:1609
+msgid "Chalet"
+msgstr "小木屋"
+
+#. item "Travel/Accomodation/Chalet"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
+#: build/trans_presets.java:1611
+msgid "Edit Chalet"
+msgstr "编辑小木屋"
+
+#. item "Travel/Accomodation/Chalet" text "Name"
+#: build/trans_presets.java:1615
+msgid "Hostel"
+msgstr "招待所"
+
+#. item "Travel/Accomodation/Hostel"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
+#: build/trans_presets.java:1617
+msgid "Edit Hostel"
+msgstr "编辑招待所"
+
+#. item "Travel/Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1621
+msgid "Alpine Hut"
+msgstr "高山小屋"
+
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1622
+msgid "Edit Alpine Hut"
+msgstr "编辑高山小屋"
+
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1627
+msgid "Caravan Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Caravan Site"
+#: build/trans_presets.java:1628
+msgid "Edit Caravan Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#: build/trans_presets.java:1632
+msgid "Camping Site"
+msgstr "露营区"
+
+#. item "Travel/Accomodation/Camping Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
+#: build/trans_presets.java:1634
+msgid "Edit Camping Site"
+msgstr "编辑露营区"
+
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1639
+msgid "Food+Drinks"
+msgstr "食物+饮料"
+
+#. group "Food+Drinks"
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Hotel"/>
+#. </button>
+#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+msgid "Restaurant"
+msgstr "餐厅"
+
+#. item "Food+Drinks/Restaurant"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
+#: build/trans_presets.java:1642
+msgid "Edit Restaurant"
+msgstr "编辑餐厅"
+
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "Cuisine"
+msgstr "烹调风格"
+
+#. item "Food+Drinks/Restaurant" combo "Cuisine"
+#. item "Food+Drinks/Fast Food" combo "Cuisine"
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "italian"
+msgstr "意大利文"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "chinese"
+msgstr "中式"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "pizza"
+msgstr "披萨"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "burger"
+msgstr "汉堡"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "greek"
+msgstr "希腊式"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "german"
+msgstr "德式"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "indian"
+msgstr "印度料理"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "regional"
+msgstr "地方料理"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "kebab"
+msgstr ""
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "turkish"
+msgstr "土耳其料理"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "asian"
+msgstr "亚式"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "thai"
+msgstr "泰式"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "mexican"
+msgstr "墨西哥式"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "japanese"
+msgstr "日式"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "french"
+msgstr "法式"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "sandwich"
+msgstr "三明治"
+
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgid "sushi"
+msgstr "寿司"
+
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
+msgid "Fast Food"
+msgstr "快餐"
+
+#. item "Food+Drinks/Fast Food"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
+#: build/trans_presets.java:1651
+msgid "Edit Fast Food Restaurant"
+msgstr "编辑快餐餐厅"
+
+#: build/trans_presets.java:1654
+msgid "fish_and_chips"
+msgstr "鱼和薯条"
+
+#: build/trans_presets.java:1654
+msgid "chicken"
+msgstr "鸡肉"
+
+#: build/trans_presets.java:1657
+msgid "Cafe"
+msgstr "咖啡"
+
+#. item "Food+Drinks/Cafe"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
+#: build/trans_presets.java:1659
+msgid "Edit Cafe"
+msgstr "编辑咖啡厅"
+
+#: build/trans_presets.java:1664
+msgid "Pub"
+msgstr "酒店"
+
+#. item "Food+Drinks/Pub"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
+#: build/trans_presets.java:1666
+msgid "Edit Pub"
+msgstr "编辑酒店"
+
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
+msgid "Biergarten"
+msgstr ""
+
+#. item "Food+Drinks/Biergarten"
+#: build/trans_presets.java:1673
+msgid "Edit Biergarten"
+msgstr ""
+
+#: build/trans_presets.java:1678
+msgid "Bar"
+msgstr "酒吧"
+
+#. item "Food+Drinks/Bar"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
+#: build/trans_presets.java:1680
+msgid "Edit Bar"
+msgstr "编辑酒吧"
+
+#: build/trans_presets.java:1685
+msgid "Nightclub"
+msgstr "夜店"
+
+#. item "Food+Drinks/Nightclub"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
+#: build/trans_presets.java:1687
+msgid "Edit Nightclub"
+msgstr "编辑夜店"
+
+#: build/trans_presets.java:1693
+msgid "Tourism"
+msgstr "旅游相关"
+
+#. group "Tourism"
+#: build/trans_presets.java:1694
+msgid "Attraction"
+msgstr "景点"
+
+#. item "Tourism/Attraction"
+#: build/trans_presets.java:1695
+msgid "Edit Attraction"
+msgstr "编辑景点"
+
+#. item "Tourism/Attraction" text "Opening Hours"
+#: build/trans_presets.java:1700
+msgid "Museum"
+msgstr "博物馆"
+
+#. item "Tourism/Museum"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1702
+msgid "Edit Museum"
+msgstr "编辑博物馆"
+
+#: build/trans_presets.java:1707
+msgid "Zoo"
+msgstr "动物园"
+
+#. item "Tourism/Zoo"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
+#: build/trans_presets.java:1710
+msgid "Edit Zoo"
+msgstr "编辑动物园"
+
+#: build/trans_presets.java:1715
+msgid "Viewpoint"
+msgstr "景点"
+
+#. item "Tourism/Viewpoint"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1717
+msgid "Edit Viewpoint"
+msgstr "编辑景点"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1720
+msgid "Look-Out Tower"
+msgstr ""
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1722
+msgid "Theme Park"
+msgstr "主题乐园"
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1723
+msgid "Edit Theme Park"
+msgstr "编辑主题乐园"
+
+#: build/trans_presets.java:1728
+msgid "Artwork"
+msgstr "艺术工作"
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1730
+msgid "Edit Artwork"
+msgstr "编辑艺术工作"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1735
+msgid "Information Office"
+msgstr "信息服务处"
+
+#: build/trans_presets.java:1742
+msgid "Map"
+msgstr "地图"
+
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1747
+msgid "Detail Grade"
+msgstr ""
+
+#. item "Tourism/Map" combo "Detail Grade"
+#: build/trans_presets.java:1747
+msgid "topo"
+msgstr ""
+
+#. color tertiary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="unclassified"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="unsurfaced"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>20000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="residential"/>
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="living_street"/>
+#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
+msgid "street"
+msgstr "街"
+
+#: build/trans_presets.java:1747
+msgid "scheme"
+msgstr ""
+
+#: build/trans_presets.java:1748
+msgid "Shown Area"
+msgstr ""
+
+#. item "Tourism/Map" combo "Shown Area"
+#: build/trans_presets.java:1748
+msgid "site"
+msgstr ""
+
+#: build/trans_presets.java:1748
+msgid "city"
+msgstr "城市"
+
+#: build/trans_presets.java:1748
+msgid "region"
+msgstr ""
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
+msgid "Closer Description"
+msgstr ""
+
+#. item "Tourism/Map" text "Closer Description"
+#. <space />
+#. item "Tourism/Guidepost" text "Elevation"
+#. <space />
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
+msgid "Routes shown for:"
+msgstr ""
+
+#. item "Tourism/Map" label "Routes shown for:"
+#. item "Tourism/Guidepost" label "Routes shown for:"
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
+msgid "Hiking"
+msgstr "健走"
+
+#. item "Tourism/Map" check "Hiking"
+#. item "Tourism/Guidepost" check "Hiking"
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
+msgid "Cycling"
+msgstr "自行车"
+
+#. item "Tourism/Map" check "Cycling"
+#. item "Tourism/Guidepost" check "Cycling"
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
+msgid "Mountainbiking"
+msgstr ""
+
+#. item "Tourism/Map" check "Mountainbiking"
+#. item "Tourism/Guidepost" check "Mountainbiking"
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
+msgid "Skiing"
+msgstr "滑雪"
+
+#. item "Tourism/Map" check "Skiing"
+#. item "Tourism/Guidepost" check "Skiing"
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
+msgid "Riding"
+msgstr ""
+
+#. item "Tourism/Map" check "Riding"
+#. item "Tourism/Guidepost" check "Riding"
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
+msgid "... other transportation modes possible"
+msgstr ""
+
+#. item "Tourism/Map" label "... other transportation modes possible"
+#: build/trans_presets.java:1759
+msgid "Information Board"
+msgstr "信息板"
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1764
+msgid "Board Content"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Content"
+#: build/trans_presets.java:1764
+msgid "notice"
+msgstr ""
+
+#: build/trans_presets.java:1764
+msgid "history"
+msgstr "历史"
+
+#: build/trans_presets.java:1764
+msgid "nature"
+msgstr "自然"
+
+#: build/trans_presets.java:1764
+msgid "wildlife"
+msgstr "野生"
+
+#: build/trans_presets.java:1764
+msgid "plants"
+msgstr "植物"
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1767
+msgid "Guidepost"
+msgstr "路牌"
+
+#. item "Tourism/Guidepost" label "... other transportation modes possible"
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
+msgid "Information Terminal"
+msgstr ""
+
+#. item "Tourism/Information Terminal" text "Name"
+#. item "Tourism/Audioguide" text "Name"
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
+msgid "Closer description"
+msgstr ""
+
+#: build/trans_presets.java:1796
+msgid "Audioguide"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1806
+msgid "Audioguide via mobile phone?"
+msgstr ""
+
+#. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
+#: build/trans_presets.java:1807
+msgid "Phone number"
+msgstr "电话号码"
+
+#. item "Tourism/Audioguide" text "Phone number"
+#: build/trans_presets.java:1809
+msgid "Other Information Points"
+msgstr "其他的信息点"
+
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1817
+msgid "Edit Shelter"
+msgstr "编辑庇护所"
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
+msgid "Fireplace"
+msgstr "壁炉"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:1822
+msgid "Picnic Site"
+msgstr "野餐区"
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:1823
+msgid "Edit Picnic Site"
+msgstr "编辑野餐区"
+
+#. item "Tourism/Picnic Site" check "Fireplace"
+#: build/trans_presets.java:1829
+msgid "Historic Places"
+msgstr "历史地区"
+
+#. group "Historic Places"
+#: build/trans_presets.java:1830
+msgid "Castle"
+msgstr "城堡"
+
+#. item "Historic Places/Castle"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
+#: build/trans_presets.java:1833
+msgid "Edit Castle"
+msgstr "编辑城堡"
+
+#. item "Historic Places/Castle" text "Name"
+#: build/trans_presets.java:1837
+msgid "Ruins"
+msgstr "遗迹"
+
+#. item "Historic Places/Ruins"
+#: build/trans_presets.java:1838
+msgid "Edit Ruins"
+msgstr "编辑遗迹"
+
+#: build/trans_presets.java:1843
+msgid "Archaeological Site"
+msgstr "考古学地区"
+
+#. item "Historic Places/Archaeological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
+#: build/trans_presets.java:1846
+msgid "Edit Archaeological Site"
+msgstr "编辑考古学地区"
+
+#: build/trans_presets.java:1851
+msgid "Battlefield"
+msgstr "战场"
+
+#. item "Historic Places/Battlefield"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1853
+msgid "Edit Battlefield"
+msgstr "编辑战场"
+
+#. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1857
+msgid "Palaeontological Site"
+msgstr "古生物现场"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1859
+msgid "Edit Palaeontological Site"
+msgstr "编辑古生物现场"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1864
+msgid "Monument"
+msgstr "纪念建筑"
+
+#. item "Historic Places/Monument"
+#: build/trans_presets.java:1865
+msgid "Edit Monument"
+msgstr "编辑纪念建筑"
+
+#. item "Historic Places/Monument" text "Name"
+#: build/trans_presets.java:1869
+msgid "Memorial"
+msgstr "纪念碑"
+
+#. item "Historic Places/Memorial"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
+#: build/trans_presets.java:1871
+msgid "Edit Memorial"
+msgstr "编辑纪念碑"
+
+#. item "Historic Places/Memorial" text "Name"
+#: build/trans_presets.java:1875
+msgid "Wayside Cross"
+msgstr ""
+
+#. item "Historic Places/Wayside Cross"
+#: build/trans_presets.java:1876
+msgid "Edit Wayside Cross"
+msgstr ""
+
+#. item "Historic Places/Wayside Cross" text "Name"
+#: build/trans_presets.java:1880
+msgid "Wayside Shrine"
+msgstr ""
+
+#. item "Historic Places/Wayside Shrine"
+#: build/trans_presets.java:1881
+msgid "Edit Wayside Shrine"
+msgstr ""
+
+#. item "Historic Places/Wayside Shrine" text "Name"
+#: build/trans_presets.java:1885
+msgid "Boundary Stone"
+msgstr "边界石"
+
+#. item "Historic Places/Boundary Stone"
+#: build/trans_presets.java:1886
+msgid "Edit Boundary Stone"
+msgstr "编辑边界石"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1891
+msgid "Leisure"
+msgstr "休闲"
+
+#. group "Leisure"
+#: build/trans_presets.java:1892
+msgid "Water Park"
+msgstr "水上乐园"
+
+#. item "Leisure/Water Park"
+#: build/trans_presets.java:1893
+msgid "Edit Water Park"
+msgstr "编辑水上乐园"
+
+#. item "Leisure/Water Park" text "Name"
+#: build/trans_presets.java:1897
+msgid "Playground"
+msgstr "运动场"
+
+#. item "Leisure/Playground"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
+#: build/trans_presets.java:1899
+msgid "Edit Playground"
+msgstr "编辑运动场"
+
+#. item "Leisure/Playground" text "Name"
+#: build/trans_presets.java:1903
+msgid "Fishing"
+msgstr "钓鱼"
+
+#. item "Leisure/Fishing"
+#: build/trans_presets.java:1904
+msgid "Edit Fishing"
+msgstr "编辑钓鱼场"
+
+#. item "Leisure/Fishing" text "Name"
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
+msgid "Sports"
+msgstr "运动用品"
+
+#. group "Sports"
+#: build/trans_presets.java:1911
+msgid "Sport Facilities"
+msgstr "运动设施"
+
+#. group "Sports/Sport Facilities"
+#: build/trans_presets.java:1912
+msgid "Stadium"
+msgstr "竞技场"
+
+#. item "Sports/Sport Facilities/Stadium"
+#: build/trans_presets.java:1913
+msgid "Edit Stadium"
+msgstr "编辑竞技扬"
+
+#. item "Sports/Sport Facilities/Stadium" text "Name"
+#. <space />
+#. item "Sports/Sport Facilities/Sports Centre" text "Name"
+#. <space />
+#. item "Sports/Sport Facilities/Pitch" text "Name"
+#. <space />
+#. item "Sports/Sport Facilities/Racetrack" text "Name"
+#. <space />
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
+msgid "select sport:"
+msgstr "选择运动："
+
+#. item "Sports/Sport Facilities/Stadium" label "select sport:"
+#. <space />
+#. item "Sports/Sport Facilities/Sports Centre" label "select sport:"
+#. <space />
+#. item "Sports/Sport Facilities/Pitch" label "select sport:"
+#. <space />
+#. item "Sports/Sport Facilities/Racetrack" label "select sport:"
+#. <space />
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--sport tags -->
+#.
+#. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="10pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="athletics"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="soccer"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="australian_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="american_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="canadian_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="gaelic_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rugby_league"/>
+#. color sport
+#. <icon src="sport/football.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rugby_union"/>
+#. color sport
+#. <icon src="sport/football.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="baseball"/>
+#. color sport
+#. <icon src="sport/baseball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="basketball"/>
+#. color sport
+#. <icon src="sport/basketball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="boules"/>
+#. color sport
+#. <icon src="sport/boule.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="bowls"/>
+#. color sport
+#. <icon src="sport/boule.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="climbing"/>
+#. color sport
+#. <icon src="sport/climbing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="cricket"/>
+#. color sport
+#. <icon src="sport/cricket.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="cricket_nets"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="croquet"/>
+#. color sport
+#. <icon src="sport/croquet.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="cycling"/>
+#. color sport
+#. <icon src="sport/cycling.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="dog_racing"/>
+#. color sport
+#. <icon src="leisure/dog.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="equestrian"/>
+#. color sport
+#. <icon src="sport/riding.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="golf"/>
+#. color sport
+#. <icon src="sport/golf.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="gymnastics"/>
+#. color sport
+#. <icon src="sport/multi.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="hockey"/>
+#. color sport
+#. <icon src="sport/hockey.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="horse_racing"/>
+#. color sport
+#. <icon src="sport/riding.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="motor"/>
+#. color sport
+#. <icon src="vehicle/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="multi"/>
+#. color sport
+#. <icon src="sport/multi.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="pelota"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="racquet"/>
+#. color sport
+#. <icon src="sport/racquetball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="skating"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="skateboard"/>
+#. color sport
+#. <icon src="sport/skateboard.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="swimming"/>
+#. color sport
+#. <icon src="sport/pool.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="skiing"/>
+#. color sport
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="table_tennis"/>
+#. color sport
+#. <icon src="sport/table_tennis.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="tennis"/>
+#. color sport
+#. <icon src="sport/tennis.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="paintball"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="squash"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="shooting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="volleyball"/>
+#. color sport
+#. <icon annotate="true" src="sport/volleyball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="beachvolleyball"/>
+#. color sport
+#. <icon annotate="true" src="sport/volleyball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="bowling"/>
+#. color sport
+#. <icon annotate="true" src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="handball"/>
+#. color sport
+#. <icon annotate="true" src="sport/handball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rowing"/>
+#. color sport
+#. <icon annotate="true" src="sport/rowing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="sailing"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="diving"/>
+#. color sport
+#. <icon annotate="true" src="sport/diving.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="badminton"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="archery"/>
+#. color sport
+#. <icon annotate="true" src="sport/archery.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="fishing"/>
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
+msgid "sport"
+msgstr "运动"
+
+#. item "Sports/Sport Facilities/Stadium" combo "sport"
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport"
+#. item "Sports/Sport Facilities/Pitch" combo "sport"
+#. item "Sports/Sport Facilities/Racetrack" combo "sport"
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "multi"
+msgstr "多种"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "archery"
+msgstr "射箭"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "athletics"
+msgstr "田径"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "american_football"
+msgstr "橄榄球"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "australian_football"
+msgstr "澳洲足球"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "baseball"
+msgstr "棒球"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "basketball"
+msgstr "篮球"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "boules"
+msgstr ""
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "bowls"
+msgstr "保龄球"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "canadian_football"
+msgstr "加拿大足球"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "canoe"
+msgstr "独木舟"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "climbing"
+msgstr "攀岩"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "cricket"
+msgstr ""
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "cricket_nets"
+msgstr ""
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "croquet"
+msgstr "木球"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "cycling"
+msgstr "自行车"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "dog_racing"
+msgstr "赛狗"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "equestrian"
+msgstr "马术"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "gaelic_football"
+msgstr ""
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "golf"
+msgstr "高尔夫"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "gymnastics"
+msgstr "体操"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "hockey"
+msgstr "曲棍球"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "horse_racing"
+msgstr "赛马"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "motor"
+msgstr "摩托车"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "pelota"
+msgstr ""
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "racquet"
+msgstr ""
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "rugby_league"
+msgstr ""
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "rugby_union"
+msgstr ""
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "shooting"
+msgstr "射击"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "skateboard"
+msgstr ""
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "skating"
+msgstr "滑冰"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "skiing"
+msgstr "滑雪"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "soccer"
+msgstr "足球"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "swimming"
+msgstr "游泳"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "table_tennis"
+msgstr "桌球"
+
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgid "tennis"
+msgstr "网球"
+
+#: build/trans_presets.java:1921
+msgid "Sports Centre"
+msgstr "运动中心"
+
+#. item "Sports/Sport Facilities/Sports Centre"
+#: build/trans_presets.java:1922
+msgid "Edit Sports Centre"
+msgstr "编辑运动中心"
+
+#: build/trans_presets.java:1930
+msgid "Pitch"
+msgstr "足球场"
+
+#. item "Sports/Sport Facilities/Pitch"
+#: build/trans_presets.java:1931
+msgid "Edit Pitch"
+msgstr "编辑足球场"
+
+#: build/trans_presets.java:1939
+msgid "Racetrack"
+msgstr "跑道"
+
+#. item "Sports/Sport Facilities/Racetrack"
+#: build/trans_presets.java:1940
+msgid "Edit Racetrack"
+msgstr "编辑跑道"
+
+#: build/trans_presets.java:1948
+msgid "Golf Course"
+msgstr "高尔夫路线"
+
+#. item "Sports/Sport Facilities/Golf Course"
+#: build/trans_presets.java:1949
+msgid "Edit Golf Course"
+msgstr "编辑高尔夫路线"
+
+#: build/trans_presets.java:1954
+msgid "Miniature Golf"
+msgstr "迷你高尔夫"
+
+#. item "Sports/Sport Facilities/Miniature Golf"
+#: build/trans_presets.java:1955
+msgid "Edit Miniature Golf"
+msgstr "编辑迷你高尔夫"
+
+#: build/trans_presets.java:1961
+msgid "Sport"
+msgstr "运动"
+
+#. group "Sport"
+#: build/trans_presets.java:1962
+msgid "Multi"
+msgstr "多种"
+
+#. item "Sport/Multi"
+#: build/trans_presets.java:1963
+msgid "Edit Multi"
+msgstr "编辑多种"
+
+#. item "Sport/Multi" text "Name"
+#. item "Sport/10pin" text "Name"
+#. item "Sport/Athletics" text "Name"
+#. item "Sport/Archery" text "Name"
+#. item "Sport/Climbing" text "Name"
+#. item "Sport/Canoeing" text "Name"
+#. item "Sport/Cycling" text "Name"
+#. item "Sport/Dog Racing" text "Name"
+#. item "Sport/Equestrian" text "Name"
+#. item "Sport/Horse Racing" text "Name"
+#. item "Sport/Gymnastics" text "Name"
+#. item "Sport/Motor Sports" text "Name"
+#. item "Sport/Skating" text "Name"
+#. item "Sport/Skateboard" text "Name"
+#. item "Sport/Swimming" text "Name"
+#. item "Sport/Shooting" text "Name"
+#. item "Sport (Ball)/Soccer" text "Name"
+#. item "Sport (Ball)/Australian Football" text "Name"
+#. item "Sport (Ball)/American Football" text "Name"
+#. item "Sport (Ball)/Canadian Football" text "Name"
+#. item "Sport (Ball)/Gaelic Football" text "Name"
+#. item "Sport (Ball)/Rugby League" text "Name"
+#. item "Sport (Ball)/Rugby Union" text "Name"
+#. item "Sport (Ball)/Baseball" text "Name"
+#. item "Sport (Ball)/Basketball" text "Name"
+#. item "Sport (Ball)/Golf" text "Name"
+#. item "Sport (Ball)/Boule" text "Name"
+#. item "Sport (Ball)/Bowls" text "Name"
+#. item "Sport (Ball)/Cricket" text "Name"
+#. item "Sport (Ball)/Cricket Nets" text "Name"
+#. item "Sport (Ball)/Croquet" text "Name"
+#. item "Sport (Ball)/Hockey" text "Name"
+#. item "Sport (Ball)/Pelota" text "Name"
+#. item "Sport (Ball)/Racquet" text "Name"
+#. item "Sport (Ball)/Table Tennis" text "Name"
+#. item "Sport (Ball)/Tennis" text "Name"
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
+msgid "type"
+msgstr "类型"
+
+#. item "Sport/Multi" combo "type"
+#. item "Sport/10pin" combo "type"
+#. item "Sport/Athletics" combo "type"
+#. item "Sport/Archery" combo "type"
+#. item "Sport/Climbing" combo "type"
+#. item "Sport/Canoeing" combo "type"
+#. item "Sport/Cycling" combo "type"
+#. item "Sport/Dog Racing" combo "type"
+#. item "Sport/Equestrian" combo "type"
+#. item "Sport/Horse Racing" combo "type"
+#. item "Sport/Gymnastics" combo "type"
+#. item "Sport/Motor Sports" combo "type"
+#. item "Sport/Skating" combo "type"
+#. item "Sport/Skateboard" combo "type"
+#. item "Sport/Swimming" combo "type"
+#. item "Sport/Skiing" combo "type"
+#. item "Sport/Shooting" combo "type"
+#. item "Sport (Ball)/Soccer" combo "type"
+#. item "Sport (Ball)/Australian Football" combo "type"
+#. item "Sport (Ball)/American Football" combo "type"
+#. item "Sport (Ball)/Canadian Football" combo "type"
+#. item "Sport (Ball)/Gaelic Football" combo "type"
+#. item "Sport (Ball)/Rugby League" combo "type"
+#. item "Sport (Ball)/Rugby Union" combo "type"
+#. item "Sport (Ball)/Baseball" combo "type"
+#. item "Sport (Ball)/Basketball" combo "type"
+#. item "Sport (Ball)/Boule" combo "type"
+#. item "Sport (Ball)/Bowls" combo "type"
+#. item "Sport (Ball)/Cricket" combo "type"
+#. item "Sport (Ball)/Cricket Nets" combo "type"
+#. item "Sport (Ball)/Croquet" combo "type"
+#. item "Sport (Ball)/Hockey" combo "type"
+#. item "Sport (Ball)/Pelota" combo "type"
+#. item "Sport (Ball)/Racquet" combo "type"
+#. item "Sport (Ball)/Table Tennis" combo "type"
+#. item "Sport (Ball)/Tennis" combo "type"
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
+msgid "pitch"
+msgstr ""
+
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
+msgid "sports_centre"
+msgstr "运动中心"
+
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
+msgid "stadium"
+msgstr "竞技扬"
+
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
+msgid "track"
+msgstr ""
+
+#: build/trans_presets.java:1968
+msgid "10pin"
+msgstr ""
+
+#. item "Sport/10pin"
+#: build/trans_presets.java:1969
+msgid "Edit 10pin"
+msgstr ""
+
+#: build/trans_presets.java:1974
+msgid "Athletics"
+msgstr "田径"
+
+#. item "Sport/Athletics"
+#: build/trans_presets.java:1975
+msgid "Edit Athletics"
+msgstr "编辑田径"
+
+#: build/trans_presets.java:1980
+msgid "Archery"
+msgstr "射箭"
+
+#. item "Sport/Archery"
+#: build/trans_presets.java:1981
+msgid "Edit Archery"
+msgstr "编辑射箭"
+
+#: build/trans_presets.java:1986
+msgid "Climbing"
+msgstr "攀岩"
+
+#. item "Sport/Climbing"
+#: build/trans_presets.java:1987
+msgid "Edit Climbing"
+msgstr "编辑攀岩"
+
+#: build/trans_presets.java:1992
+msgid "Canoeing"
+msgstr "独木舟"
+
+#. item "Sport/Canoeing"
+#: build/trans_presets.java:1993
+msgid "Edit Canoeing"
+msgstr "编辑独木舟"
+
+#. item "Sport/Cycling"
+#: build/trans_presets.java:1999
+msgid "Edit Cycling"
+msgstr "编辑自行车"
+
+#: build/trans_presets.java:2004
+msgid "Dog Racing"
+msgstr "赛狗"
+
+#. item "Sport/Dog Racing"
+#: build/trans_presets.java:2005
+msgid "Edit Dog Racing"
+msgstr "编辑赛狗"
+
+#: build/trans_presets.java:2010
+msgid "Equestrian"
+msgstr "马术"
+
+#. item "Sport/Equestrian"
+#: build/trans_presets.java:2011
+msgid "Edit Equestrian"
+msgstr "编辑马术"
+
+#: build/trans_presets.java:2016
+msgid "Horse Racing"
+msgstr "赛马"
+
+#. item "Sport/Horse Racing"
+#: build/trans_presets.java:2017
+msgid "Edit Horse Racing"
+msgstr "编辑赛马"
+
+#: build/trans_presets.java:2022
+msgid "Gymnastics"
+msgstr "体操"
+
+#. item "Sport/Gymnastics"
+#: build/trans_presets.java:2023
+msgid "Edit Gymnastics"
+msgstr "编辑体操"
+
+#: build/trans_presets.java:2028
+msgid "Motor Sports"
+msgstr "摩托车运动"
+
+#. item "Sport/Motor Sports"
+#: build/trans_presets.java:2029
+msgid "Edit Motor Sports"
+msgstr "编辑摩托车运动"
+
+#: build/trans_presets.java:2034
+msgid "Skating"
+msgstr "溜冰"
+
+#. item "Sport/Skating"
+#: build/trans_presets.java:2035
+msgid "Edit Skating"
+msgstr "编辑溜冰"
+
+#: build/trans_presets.java:2040
+msgid "Skateboard"
+msgstr "滑板"
+
+#. item "Sport/Skateboard"
+#: build/trans_presets.java:2041
+msgid "Edit Skateboard"
+msgstr "编辑滑板"
+
+#: build/trans_presets.java:2046
+msgid "Swimming"
+msgstr "游泳"
+
+#. item "Sport/Swimming"
+#: build/trans_presets.java:2047
+msgid "Edit Swimming"
+msgstr "编辑游泳"
+
+#. item "Sport/Skiing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+#: build/trans_presets.java:2054
+msgid "Edit Skiing"
+msgstr "编辑滑雪"
+
+#. item "Sport/Skiing" text "Name"
+#: build/trans_presets.java:2057
+msgid "Piste type"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Piste type"
+#: build/trans_presets.java:2057
+msgid "downhill"
+msgstr ""
+
+#: build/trans_presets.java:2057
+msgid "nordic"
+msgstr ""
+
+#: build/trans_presets.java:2057
+msgid "snow_park"
+msgstr ""
+
+#: build/trans_presets.java:2058
+msgid "Difficulty"
+msgstr "困难度"
+
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:2058
+msgid "novice"
+msgstr "新手"
+
+#: build/trans_presets.java:2058
+msgid "easy"
+msgstr "容易"
+
+#: build/trans_presets.java:2058
+msgid "advanced"
+msgstr "进阶"
+
+#: build/trans_presets.java:2058
+msgid "expert"
+msgstr "专家"
+
+#: build/trans_presets.java:2058
+msgid "freeride"
+msgstr ""
+
+#: build/trans_presets.java:2061
+msgid "Shooting"
+msgstr "射击"
+
+#. item "Sport/Shooting"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
+#: build/trans_presets.java:2063
+msgid "Edit Shooting"
+msgstr "编辑射击"
+
+#: build/trans_presets.java:2069
+msgid "Sport (Ball)"
+msgstr "运动(球类)"
+
+#. group "Sport (Ball)"
+#: build/trans_presets.java:2070
+msgid "Soccer"
+msgstr "足球"
+
+#. item "Sport (Ball)/Soccer"
+#: build/trans_presets.java:2071
+msgid "Edit Soccer"
+msgstr "编辑足球"
+
+#: build/trans_presets.java:2076
+msgid "Australian Football"
+msgstr "澳洲足球"
+
+#. item "Sport (Ball)/Australian Football"
+#: build/trans_presets.java:2077
+msgid "Edit Australian Football"
+msgstr "编辑澳洲足球"
+
+#: build/trans_presets.java:2082
+msgid "American Football"
+msgstr ""
+
+#. item "Sport (Ball)/American Football"
+#: build/trans_presets.java:2083
+msgid "Edit American Football"
+msgstr ""
+
+#: build/trans_presets.java:2088
+msgid "Canadian Football"
+msgstr ""
+
+#. item "Sport (Ball)/Canadian Football"
+#: build/trans_presets.java:2089
+msgid "Edit Canadian Football"
+msgstr ""
+
+#: build/trans_presets.java:2094
+msgid "Gaelic Football"
+msgstr ""
+
+#. item "Sport (Ball)/Gaelic Football"
+#: build/trans_presets.java:2095
+msgid "Edit Gaelic Football"
+msgstr ""
+
+#: build/trans_presets.java:2100
+msgid "Rugby League"
+msgstr ""
+
+#. item "Sport (Ball)/Rugby League"
+#: build/trans_presets.java:2101
+msgid "Edit Rugby League"
+msgstr ""
+
+#: build/trans_presets.java:2106
+msgid "Rugby Union"
+msgstr ""
+
+#. item "Sport (Ball)/Rugby Union"
+#: build/trans_presets.java:2107
+msgid "Edit Rugby Union"
+msgstr ""
+
+#: build/trans_presets.java:2112
+msgid "Baseball"
+msgstr "棒球"
+
+#. item "Sport (Ball)/Baseball"
+#: build/trans_presets.java:2113
+msgid "Edit Baseball"
+msgstr "编辑棒球"
+
+#: build/trans_presets.java:2118
+msgid "Basketball"
+msgstr "篮球"
+
+#. item "Sport (Ball)/Basketball"
+#: build/trans_presets.java:2119
+msgid "Edit Basketball"
+msgstr "编辑篮球"
+
+#: build/trans_presets.java:2124
+msgid "Golf"
+msgstr "高尔夫"
+
+#. item "Sport (Ball)/Golf"
+#: build/trans_presets.java:2125
+msgid "Edit Golf"
+msgstr "编辑高尔夫"
+
+#. item "Sport (Ball)/Golf" combo "type"
+#: build/trans_presets.java:2128
+msgid "golf_course"
+msgstr "高尔夫路线"
+
+#: build/trans_presets.java:2130
+msgid "Boule"
+msgstr ""
+
+#. item "Sport (Ball)/Boule"
+#: build/trans_presets.java:2131
+msgid "Edit Boule"
+msgstr ""
+
+#: build/trans_presets.java:2136
+msgid "Bowls"
+msgstr "保龄球"
+
+#. item "Sport (Ball)/Bowls"
+#: build/trans_presets.java:2137
+msgid "Edit Bowls"
+msgstr "编辑保龄球"
+
+#: build/trans_presets.java:2142
+msgid "Cricket"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket"
+#: build/trans_presets.java:2143
+msgid "Edit Cricket"
+msgstr ""
+
+#: build/trans_presets.java:2148
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
+#: build/trans_presets.java:2149
+msgid "Edit Cricket Nets"
+msgstr ""
+
+#: build/trans_presets.java:2154
+msgid "Croquet"
+msgstr "木球"
+
+#. item "Sport (Ball)/Croquet"
+#: build/trans_presets.java:2155
+msgid "Edit Croquet"
+msgstr "编辑木球"
+
+#: build/trans_presets.java:2160
+msgid "Hockey"
+msgstr "曲棍球"
+
+#. item "Sport (Ball)/Hockey"
+#: build/trans_presets.java:2161
+msgid "Edit Hockey"
+msgstr "编曲棍球"
+
+#: build/trans_presets.java:2166
+msgid "Pelota"
+msgstr "回力球"
+
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2167
+msgid "Edit Pelota"
+msgstr "编辑回力球"
+
+#: build/trans_presets.java:2172
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
+#: build/trans_presets.java:2173
+msgid "Edit Racquet"
+msgstr ""
+
+#: build/trans_presets.java:2178
+msgid "Table Tennis"
+msgstr "桌球"
+
+#. item "Sport (Ball)/Table Tennis"
+#: build/trans_presets.java:2179
+msgid "Edit Table Tennis"
+msgstr "编辑桌球"
+
+#: build/trans_presets.java:2184
+msgid "Tennis"
+msgstr "网球"
+
+#. item "Sport (Ball)/Tennis"
+#: build/trans_presets.java:2185
+msgid "Edit Tennis"
+msgstr "编辑网球"
+
+#: build/trans_presets.java:2192
+msgid "Man-Made"
+msgstr "人造"
+
+#. group "Man-Made/Buildings"
+#: build/trans_presets.java:2194
+msgid "Building"
+msgstr "建筑物"
+
+#. item "Man-Made/Buildings/Building"
+#. <key key="building" value="yes" />
+#: build/trans_presets.java:2197
+msgid "Public Building"
+msgstr "公共建筑"
+
+#. item "Man-Made/Buildings/Public Building"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
+#: build/trans_presets.java:2199
+msgid "Edit Public Building"
+msgstr "编辑公共建筑"
+
+#. item "Man-Made/Buildings/Public Building" text "Name"
+#: build/trans_presets.java:2203
+msgid "Town hall"
+msgstr "县市政府/公所"
+
+#. item "Man-Made/Buildings/Town hall"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
+#: build/trans_presets.java:2205
+msgid "Edit Town hall"
+msgstr "编辑县市政府/公所"
+
+#. item "Man-Made/Buildings/Town hall" text "Name"
+#: build/trans_presets.java:2209
+msgid "Embassy"
+msgstr "大使馆"
+
+#. item "Man-Made/Buildings/Embassy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
+#: build/trans_presets.java:2211
+msgid "Edit Embassy"
+msgstr "编辑大使馆"
+
+#. item "Man-Made/Buildings/Embassy" text "Name"
+#: build/trans_presets.java:2215
+msgid "Courthouse"
+msgstr "法院"
+
+#. item "Man-Made/Buildings/Courthouse"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
+#: build/trans_presets.java:2218
+msgid "Edit Courthouse"
+msgstr "编辑法院"
+
+#. item "Man-Made/Buildings/Courthouse" text "Name"
+#: build/trans_presets.java:2222
+msgid "Prison"
+msgstr "监狱"
+
+#. item "Man-Made/Buildings/Prison"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
+#: build/trans_presets.java:2225
+msgid "Edit Prison"
+msgstr "编辑监狱"
+
+#. item "Man-Made/Buildings/Prison" text "Name"
+#: build/trans_presets.java:2229
+msgid "Police"
+msgstr "警察局"
+
+#. item "Man-Made/Buildings/Police"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
+#: build/trans_presets.java:2233
+msgid "Edit Police"
+msgstr "编辑警察局"
+
+#. item "Man-Made/Buildings/Police" text "Name"
+#: build/trans_presets.java:2237
+msgid "Fire Station"
+msgstr "消防队"
+
+#. item "Man-Made/Buildings/Fire Station"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
+#: build/trans_presets.java:2240
+msgid "Edit Fire Station"
+msgstr "编辑消防队"
+
+#. item "Man-Made/Buildings/Fire Station" text "Name"
+#: build/trans_presets.java:2244
+msgid "Post Office"
+msgstr "邮局"
+
+#. item "Man-Made/Buildings/Post Office"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
+#: build/trans_presets.java:2246
+msgid "Edit Post Office"
+msgstr "编辑邮局"
+
+#. item "Man-Made/Buildings/Post Office" text "Operator"
+#. <separator/>
+#: build/trans_presets.java:2252
+msgid "Kindergarten"
+msgstr "幼稚园"
+
+#. item "Man-Made/Buildings/Kindergarten"
+#: build/trans_presets.java:2253
+msgid "Edit Kindergarten"
+msgstr "编辑幼稚园"
+
+#. item "Man-Made/Buildings/Kindergarten" text "Name"
+#: build/trans_presets.java:2257
+msgid "School"
+msgstr "学校"
+
+#. item "Man-Made/Buildings/School"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
+#: build/trans_presets.java:2259
+msgid "Edit School"
+msgstr "编辑学校"
+
+#. item "Man-Made/Buildings/School" text "Name"
+#: build/trans_presets.java:2263
+msgid "University"
+msgstr "大学"
+
+#. item "Man-Made/Buildings/University"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
+#: build/trans_presets.java:2265
+msgid "Edit University"
+msgstr "编辑大学"
+
+#. item "Man-Made/Buildings/University" text "Name"
+#: build/trans_presets.java:2269
+msgid "College"
+msgstr "学院"
+
+#. item "Man-Made/Buildings/College"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
+#: build/trans_presets.java:2271
+msgid "Edit College"
+msgstr "编辑学院"
+
+#. item "Man-Made/Buildings/College" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2276
+msgid "Cinema"
+msgstr "电影院"
+
+#. item "Man-Made/Buildings/Cinema"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
+#: build/trans_presets.java:2279
+msgid "Edit Cinema"
+msgstr "编辑电影院"
+
+#. item "Man-Made/Buildings/Cinema" text "Name"
+#: build/trans_presets.java:2283
+msgid "Library"
+msgstr "图书馆"
+
+#. item "Man-Made/Buildings/Library"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
+#: build/trans_presets.java:2286
+msgid "Edit Library"
+msgstr "编辑图书馆"
+
+#: build/trans_presets.java:2291
+msgid "Arts Centre"
+msgstr "美术馆"
+
+#. item "Man-Made/Buildings/Arts Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
+#: build/trans_presets.java:2293
+msgid "Edit Arts Centre"
+msgstr "编辑美术馆"
+
+#. item "Man-Made/Buildings/Arts Centre" text "Name"
+#: build/trans_presets.java:2297
+msgid "Theatre"
+msgstr "剧院"
+
+#. item "Man-Made/Buildings/Theatre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
+#: build/trans_presets.java:2300
+msgid "Edit Theatre"
+msgstr "编辑剧院"
+
+#. item "Man-Made/Buildings/Theatre" text "Name"
+#: build/trans_presets.java:2304
+msgid "Place of Worship"
+msgstr "宗教仪式场所"
+
+#. item "Man-Made/Buildings/Place of Worship"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
+#. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
+#: build/trans_presets.java:2308
+msgid "Edit Place of Worship"
+msgstr "编辑宗教仪式场所"
+
+#. item "Man-Made/Buildings/Place of Worship" text "Name"
+#. item "Land use/Graveyard" text "Name"
+#. item "Land use/Cemetery" text "Name"
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "Religion"
+msgstr "宗教"
+
+#. item "Man-Made/Buildings/Place of Worship" combo "Religion"
+#. item "Land use/Graveyard" combo "Religion"
+#. item "Land use/Cemetery" combo "Religion"
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "bahai"
+msgstr "巴海大同教"
+
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "buddhist"
+msgstr "佛教"
+
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "christian"
+msgstr "基督教系"
+
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "hindu"
+msgstr "印度教"
+
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "jain"
+msgstr "耆那教"
+
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "jewish"
+msgstr "犹太教"
+
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "muslim"
+msgstr "回教"
+
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "sikh"
+msgstr "锡克教"
+
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "spiritualist"
+msgstr ""
+
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "taoist"
+msgstr "道教"
+
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
+msgid "zoroastrian"
+msgstr "祆教"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "Denomination"
+msgstr "教派"
+
+#. item "Man-Made/Buildings/Place of Worship" combo "Denomination"
+#. item "Land use/Graveyard" combo "Denomination"
+#. item "Land use/Cemetery" combo "Denomination"
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "anglican"
+msgstr "英国国教"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "baptist"
+msgstr "浸信会"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "catholic"
+msgstr "天主教"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "evangelical"
+msgstr "福音派教会"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "jehovahs_witness"
+msgstr ""
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "lutheran"
+msgstr "路德教派"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "methodist"
+msgstr "卫理公会教"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "mormon"
+msgstr "摩门教"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "orthodox"
+msgstr "东正教"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "pentecostal"
+msgstr "圣灵降临教派"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "presbyterian"
+msgstr "长老派教会"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "protestant"
+msgstr "新教"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "quaker"
+msgstr "教友派"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "shia"
+msgstr "什叶派"
+
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
+msgid "sunni"
+msgstr "逊尼派"
+
+#. <separator/>
+#: build/trans_presets.java:2316
+msgid "Addresses"
+msgstr "地址"
+
+#. item "Man-Made/Buildings/Addresses"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:2319
+msgid "Edit Address Information"
+msgstr "编辑地址信息"
+
+#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:2321
+msgid "House number"
+msgstr "门牌号码"
+
+#. item "Man-Made/Buildings/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:2323
+msgid "House name"
+msgstr "房屋名称"
+
+#. item "Man-Made/Buildings/Addresses" text "House name"
+#: build/trans_presets.java:2324
+msgid "Street name"
+msgstr "街道名称"
+
+#. item "Man-Made/Buildings/Addresses" text "Street name"
+#: build/trans_presets.java:2325
+msgid "City name"
+msgstr "城市名称"
+
+#. item "Man-Made/Buildings/Addresses" text "City name"
+#: build/trans_presets.java:2326
+msgid "Post code"
+msgstr "邮递区号"
+
+#. item "Man-Made/Buildings/Addresses" text "Post code"
+#: build/trans_presets.java:2327
+msgid "Country code"
+msgstr "国码"
+
+#. item "Man-Made/Buildings/Address Interpolation"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
+#. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
+#: build/trans_presets.java:2333
+msgid "Edit Address Interpolation"
+msgstr ""
+
+#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:2335
+msgid "Numbering scheme"
+msgstr "编号规则"
+
+#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:2335
+msgid "odd"
+msgstr "奇数"
+
+#: build/trans_presets.java:2335
+msgid "even"
+msgstr "偶数"
+
+#: build/trans_presets.java:2335
+msgid "alphabetic"
+msgstr "按字母顺序"
+
+#: build/trans_presets.java:2338
+msgid "Man Made"
+msgstr "人造物"
+
+#. group "Man Made"
+#: build/trans_presets.java:2339
+msgid "Works"
+msgstr "作品"
+
+#. item "Man Made/Works"
+#: build/trans_presets.java:2340
+msgid "Edit Works"
+msgstr "编辑作品"
+
+#. item "Man Made/Works" text "Name"
+#: build/trans_presets.java:2344
+msgid "Tower"
+msgstr "塔"
+
+#. item "Man Made/Tower"
+#: build/trans_presets.java:2345
+msgid "Edit Tower"
+msgstr "编辑塔"
+
+#. item "Man Made/Tower" text "Name"
+#: build/trans_presets.java:2348
+msgid "Tower type"
+msgstr "塔类型"
+
+#. item "Man Made/Tower" combo "Tower type"
+#: build/trans_presets.java:2348
+msgid "communication"
+msgstr "通讯"
+
+#: build/trans_presets.java:2348
+msgid "observation"
+msgstr "观测"
+
+#. <optional>
+#: build/trans_presets.java:2350
+msgid "Height (meters)"
+msgstr "高度(米)"
+
+#. item "Man Made/Tower" text "Operator"
+#. </optional>
+#: build/trans_presets.java:2354
+msgid "Water Tower"
+msgstr "贮水塔"
+
+#. item "Man Made/Water Tower"
+#: build/trans_presets.java:2355
+msgid "Edit Water Tower"
+msgstr "编辑贮水塔"
+
+#. item "Man Made/Water Tower" text "Name"
+#: build/trans_presets.java:2359
+msgid "Gasometer"
+msgstr "贮气桶"
+
+#. item "Man Made/Gasometer"
+#: build/trans_presets.java:2360
+msgid "Edit Gasometer"
+msgstr "编辑贮气桶"
+
+#. item "Man Made/Gasometer" text "Name"
+#: build/trans_presets.java:2364
+msgid "Lighthouse"
+msgstr "灯塔"
+
+#. item "Man Made/Lighthouse"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
+#: build/trans_presets.java:2366
+msgid "Edit Lighthouse"
+msgstr "编辑灯塔"
+
+#. item "Man Made/Lighthouse" text "Name"
+#: build/trans_presets.java:2370
+msgid "Windmill"
+msgstr "风车"
+
+#. item "Man Made/Windmill"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
+#: build/trans_presets.java:2372
+msgid "Edit Windmill"
+msgstr "编辑风车"
+
+#. item "Man Made/Windmill" text "Name"
+#: build/trans_presets.java:2376
+msgid "Pipeline"
+msgstr "油管"
+
+#. item "Man Made/Pipeline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
+#: build/trans_presets.java:2379
+msgid "Edit Pipeline"
+msgstr "编辑油管"
+
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
+msgid "gas"
+msgstr "天然气"
+
+#: build/trans_presets.java:2382
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2382
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2382
+msgid "sewage"
+msgstr ""
+
+#: build/trans_presets.java:2382
+msgid "any substance"
+msgstr ""
+
+#: build/trans_presets.java:2383
+msgid "Location"
+msgstr "位置"
+
+#: build/trans_presets.java:2383
+msgid "underwater"
+msgstr ""
+
+#: build/trans_presets.java:2383
+msgid "overground"
+msgstr ""
+
+#: build/trans_presets.java:2385
+msgid "Wastewater Plant"
+msgstr "污水处理厂"
+
+#. item "Man Made/Wastewater Plant"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
+#: build/trans_presets.java:2389
+msgid "Edit Wastewater Plant"
+msgstr "编辑污水处理厂"
+
+#. item "Man Made/Wastewater Plant" text "Name"
+#: build/trans_presets.java:2393
+msgid "Crane"
+msgstr "起重机"
+
+#. item "Man Made/Crane"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
+#: build/trans_presets.java:2395
+msgid "Edit Crane"
+msgstr "编辑起重机"
+
+#. item "Man Made/Beacon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
+#: build/trans_presets.java:2401
+msgid "Edit Beacon"
+msgstr ""
+
+#. item "Man Made/Beacon" text "Name"
+#: build/trans_presets.java:2405
+msgid "Survey Point"
+msgstr "测量点"
+
+#. item "Man Made/Survey Point"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
+#: build/trans_presets.java:2407
+msgid "Edit Survey Point"
+msgstr "编辑测量点"
+
+#. item "Man Made/Survey Point" text "Name"
+#: build/trans_presets.java:2411
+msgid "Surveillance"
+msgstr "监视"
+
+#. item "Man Made/Surveillance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
+#: build/trans_presets.java:2413
+msgid "Edit Surveillance Camera"
+msgstr "编辑监视摄影机"
+
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2416
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2416
+msgid "outdoor"
+msgstr "户外"
+
+#: build/trans_presets.java:2416
+msgid "public"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2419
+msgid "Power Generator"
+msgstr "发电厂"
+
+#. item "Man Made/Power Generator"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
+#: build/trans_presets.java:2423
+msgid "Edit Power Generator"
+msgstr "编辑发电厂"
+
+#. item "Man Made/Power Generator" combo "Type"
+#: build/trans_presets.java:2425
+msgid "wind"
+msgstr "风力"
+
+#: build/trans_presets.java:2425
+msgid "hydro"
+msgstr "水力"
+
+#: build/trans_presets.java:2425
+msgid "fossil"
+msgstr "燃油"
+
+#: build/trans_presets.java:2425
+msgid "nuclear"
+msgstr "核能"
+
+#: build/trans_presets.java:2425
+msgid "coal"
+msgstr "燃媒"
+
+#: build/trans_presets.java:2425
+msgid "photovoltaic"
+msgstr "光电"
+
+#. item "Man Made/Power Generator" text "Name"
+#: build/trans_presets.java:2428
+msgid "Power Station"
+msgstr "发电厂"
+
+#. item "Man Made/Power Station"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
+#: build/trans_presets.java:2431
+msgid "Edit Power Station"
+msgstr "编辑发电厂"
+
+#. item "Man Made/Power Station" text "Reference"
+#: build/trans_presets.java:2437
+msgid "Power Sub Station"
+msgstr ""
+
+#. item "Man Made/Power Sub Station"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
+#: build/trans_presets.java:2440
+msgid "Edit Power Sub Station"
+msgstr ""
+
+#. item "Man Made/Power Sub Station" text "Operator"
+#. item "Man Made/Power Line" text "Operator"
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
+msgid "Line reference"
+msgstr ""
+
+#. item "Man Made/Power Sub Station" text "Line reference"
+#: build/trans_presets.java:2445
+msgid "Power Tower"
+msgstr "电塔"
+
+#. item "Man Made/Power Tower"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
+#: build/trans_presets.java:2450
+msgid "Edit Power Tower"
+msgstr "编辑电塔"
+
+#. item "Man Made/Power Tower" combo "Type"
+#: build/trans_presets.java:2451
+msgid "tower"
+msgstr ""
+
+#: build/trans_presets.java:2451
+msgid "pole"
+msgstr ""
+
+#: build/trans_presets.java:2452
+msgid "Tower reference"
+msgstr ""
+
+#. item "Man Made/Power Tower" text "Tower reference"
+#: build/trans_presets.java:2454
+msgid "Power Line"
+msgstr "电线"
+
+#. item "Man Made/Power Line"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
+#: build/trans_presets.java:2457
+msgid "Edit Power Line"
+msgstr "编辑电线"
+
+#. item "Man Made/Power Line" label "Edit Power Line"
+#: build/trans_presets.java:2458
+msgid "Line type"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Line type"
+#: build/trans_presets.java:2458
+msgctxt "Power Line"
+msgid "line"
+msgstr ""
+
+#: build/trans_presets.java:2458
+msgctxt "Power Line"
+msgid "minor_line"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2463
+msgid "Amount of Cables"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Amount of Cables"
+#: build/trans_presets.java:2464
+msgid "Number of wires (better: conductors) per power cable"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
+#: build/trans_presets.java:2464
+msgid "single"
+msgstr ""
+
+#: build/trans_presets.java:2464
+msgid "double"
+msgstr ""
+
+#: build/trans_presets.java:2464
+msgid "triple"
+msgstr ""
+
+#: build/trans_presets.java:2464
+msgid "quad"
+msgstr ""
+
+#: build/trans_presets.java:2467
+msgid "Amenities"
+msgstr "便利设施"
+
+#. group "Amenities"
+#: build/trans_presets.java:2468
+msgid "Toilets"
+msgstr "厕所"
+
+#: build/trans_presets.java:2475
+msgid "limited"
+msgstr ""
+
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
+msgid "Note"
+msgstr ""
+
+#. item "Amenities/Toilets" text "Note"
+#: build/trans_presets.java:2478
+msgid "Post Box"
+msgstr "邮筒"
+
+#. item "Amenities/Post Box" text "Operator"
+#: build/trans_presets.java:2483
+msgid "Telephone"
+msgstr "电话"
+
+#. item "Amenities/Telephone"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
+#: build/trans_presets.java:2486
+msgid "Edit Telephone"
+msgstr "编辑电话"
+
+#. item "Amenities/Telephone" text "Operator"
+#. item "Shops/Vending machine" text "Note"
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
+msgid "Coins"
+msgstr "硬币"
+
+#. item "Amenities/Telephone" check "Coins"
+#. item "Shops/Vending machine" check "Coins"
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
+msgid "Notes"
+msgstr ""
+
+#. item "Amenities/Telephone" check "Notes"
+#. item "Shops/Vending machine" check "Notes"
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
+msgid "Electronic purses and Charge cards"
+msgstr "电子钱包或收费卡"
+
+#. item "Amenities/Telephone" check "Electronic purses and Charge cards"
+#. item "Shops/Vending machine" check "Electronic purses and Charge cards"
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
+msgid "Debit cards"
+msgstr ""
+
+#. item "Amenities/Telephone" check "Debit cards"
+#. item "Shops/Vending machine" check "Debit cards"
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
+msgid "Credit cards"
+msgstr "信用卡"
+
+#. item "Amenities/Telephone" check "Credit cards"
+#: build/trans_presets.java:2494
+msgid "Telephone cards"
+msgstr "电话卡"
+
+#. item "Amenities/Telephone" check "Telephone cards"
+#: build/trans_presets.java:2496
+msgid "Recycling"
+msgstr "资源回收"
+
+#. item "Amenities/Recycling"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
+#: build/trans_presets.java:2499
+msgid "Edit Recycling station"
+msgstr "资源回收站"
+
+#. item "Amenities/Recycling" label "Edit Recycling station"
+#. <key key="amenity" value="recycling" />
+#: build/trans_presets.java:2501
+msgid "Batteries"
+msgstr "电池"
+
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2502
+msgid "Cans"
+msgstr "瓶罐"
+
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2503
+msgid "Clothes"
+msgstr "衣服"
+
+#. item "Amenities/Recycling" check "Clothes"
+#: build/trans_presets.java:2504
+msgid "Glass"
+msgstr "玻璃"
+
+#. item "Amenities/Recycling" check "Glass"
+#: build/trans_presets.java:2505
+msgid "Paper"
+msgstr "纸张"
+
+#. item "Amenities/Recycling" check "Paper"
+#: build/trans_presets.java:2506
+msgid "Scrap Metal"
+msgstr "废金属"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2508
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2510
+msgid "Edit Waste Basket"
+msgstr ""
+
+#. item "Amenities/Bench"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
+#. <key key="amenity" value="bench" />
+#: build/trans_presets.java:2516
+msgid "Backrest"
+msgstr ""
+
+#: build/trans_presets.java:2517
+msgid "Material"
+msgstr "材质"
+
+#. item "Amenities/Bench" combo "Material"
+#: build/trans_presets.java:2517
+msgid "stone"
+msgstr "石头"
+
+#: build/trans_presets.java:2517
+msgid "plastic"
+msgstr "塑胶"
+
+#: build/trans_presets.java:2518
+msgid "Colour"
+msgstr "颜色"
+
+#. item "Amenities/Bench" combo "Colour"
+#: build/trans_presets.java:2518
+msgid "black"
+msgstr "黑色"
+
+#: build/trans_presets.java:2518
+msgid "brown"
+msgstr "浅褐色"
+
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--landuse tags -->
+#.
+#. <rule>
+#. <condition k="landuse" v="farm"/>
+#. color green
+#. <icon annotate="true" src="misc/landmark/farm.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="farmland"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="meadow"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
+#. color forest
+#. <icon src="misc/landmark/trees.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="allotments"/>
+#. color green
+#. <icon src="misc/landmark/plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="grass"/>
+#. color cemetery
+#. <icon src="rendering/landuse/cemetery.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="village_green"/>
+#. color green
+#. <icon src="leisure/common.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
+msgid "green"
+msgstr "绿色"
+
+#: build/trans_presets.java:2518
+msgid "red"
+msgstr "红色"
+
+#: build/trans_presets.java:2518
+msgid "blue"
+msgstr "蓝色"
+
+#: build/trans_presets.java:2518
+msgid "gray"
+msgstr "灰色"
+
+#: build/trans_presets.java:2518
+msgid "white"
+msgstr "白色"
+
+#: build/trans_presets.java:2519
+msgid "Amount of Seats"
+msgstr "座椅数量"
+
+#. item "Amenities/Bench" combo "Amount of Seats"
+#: build/trans_presets.java:2521
+msgid "Hunting Stand"
+msgstr ""
+
+#. item "Amenities/Hunting Stand"
+#: build/trans_presets.java:2522
+msgid "Edit Hunting Stand"
+msgstr ""
+
+#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
+#. <key key="amenity" value="hunting_stand" />
+#. item "Land use/Tree" text "Type"
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
+msgid "Height"
+msgstr "高度"
+
+#. item "Amenities/Hunting Stand" combo "Height"
+#: build/trans_presets.java:2524
+msgid "low"
+msgstr "低"
+
+#: build/trans_presets.java:2524
+msgid "half"
+msgstr "半高"
+
+#: build/trans_presets.java:2524
+msgid "full"
+msgstr "全高"
+
+#: build/trans_presets.java:2526
+msgid "Hide"
+msgstr "隐藏"
+
+#: build/trans_presets.java:2527
+msgid "Lock"
+msgstr "锁"
+
+#: build/trans_presets.java:2529
+msgid "Fountain"
+msgstr "喷泉"
+
+#. item "Amenities/Fountain"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
+#: build/trans_presets.java:2532
+msgid "Edit Fountain"
+msgstr "编辑喷泉"
+
+#. item "Amenities/Fountain" text "Name"
+#: build/trans_presets.java:2536
+msgid "Drinking Water"
+msgstr "饮水机"
+
+#. item "Amenities/Drinking Water"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
+#: build/trans_presets.java:2539
+msgid "Edit Drinking Water"
+msgstr "编辑饮水机"
+
+#. item "Amenities/Drinking Water" text "Name"
+#: build/trans_presets.java:2543
+msgid "Fire Hydrant"
+msgstr "消防栓"
+
+#. item "Amenities/Fire Hydrant"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
+#: build/trans_presets.java:2546
+msgid "Edit Fire Hydrant"
+msgstr "编辑消防栓"
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2549
+msgid "Baby Hatch"
+msgstr "弃婴保护舱"
+
+#. item "Amenities/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:2551
+msgid "Edit Baby Hatch"
+msgstr "编辑弃婴保护舱"
+
+#. item "Amenities/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:2557
+msgid "Shops"
+msgstr "商店"
+
+#. group "Shops"
+#: build/trans_presets.java:2558
+msgid "Car Dealer"
+msgstr "汽车经销商"
+
+#. item "Shops/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:2560
+msgid "Edit Car Shop"
+msgstr "编辑汽车商店"
+
+#. item "Shops/Car Dealer" text "Operator"
+#: build/trans_presets.java:2565
+msgid "Bike Dealer"
+msgstr "自行车经销商"
+
+#. item "Shops/Bike Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
+#: build/trans_presets.java:2568
+msgid "Edit Bicycle Shop"
+msgstr "编辑自行车商店"
+
+#. item "Shops/Bike Dealer" text "Name"
+#: build/trans_presets.java:2572
+msgid "Supermarket"
+msgstr "超级市场"
+
+#. item "Shops/Supermarket"
+#: build/trans_presets.java:2573
+msgid "Edit Supermarket"
+msgstr "编辑超级市场"
+
+#: build/trans_presets.java:2578
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2579
+msgid "Edit Chemist"
+msgstr ""
+
+#: build/trans_presets.java:2584
+msgid "Convenience Store"
+msgstr "便利商店"
+
+#. item "Shops/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2586
+msgid "Edit Convenience Store"
+msgstr "编辑便利商店"
+
+#: build/trans_presets.java:2591
+msgid "Kiosk"
+msgstr ""
+
+#. item "Shops/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2593
+msgid "Edit Kiosk"
+msgstr ""
+
+#: build/trans_presets.java:2598
+msgid "Book Store"
+msgstr "书店"
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2599
+msgid "Edit Book Store"
+msgstr "编辑书店"
+
+#: build/trans_presets.java:2604
+msgid "Travel Agency"
+msgstr "旅行社"
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:2605
+msgid "Edit Travel Agency"
+msgstr "编辑旅行社"
+
+#: build/trans_presets.java:2610
+msgid "Butcher"
+msgstr "肉类"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2612
+msgid "Edit Butcher"
+msgstr "编辑肉店"
+
+#: build/trans_presets.java:2617
+msgid "Baker"
+msgstr "面包类"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2619
+msgid "Edit Baker"
+msgstr "编辑面包店"
+
+#: build/trans_presets.java:2624
+msgid "Florist"
+msgstr "花类"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2626
+msgid "Edit Florist"
+msgstr "编辑花店"
+
+#: build/trans_presets.java:2631
+msgid "Organic"
+msgstr "有机产品"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2632
+msgid "Edit Organic Shop"
+msgstr "编辑有机产品商店"
+
+#: build/trans_presets.java:2637
+msgid "Alcohol"
+msgstr "酒类"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2639
+msgid "Edit Alcohol Shop"
+msgstr "编辑卖酒的商店"
+
+#: build/trans_presets.java:2644
+msgid "Beverages"
+msgstr "饮料类"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2645
+msgid "Edit Beverages Shop"
+msgstr "编辑饮料店"
+
+#: build/trans_presets.java:2650
+msgid "Computer"
+msgstr "电脑类"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2651
+msgid "Edit Computer Shop"
+msgstr "编辑电脑商店"
+
+#: build/trans_presets.java:2656
+msgid "Electronics"
+msgstr "电子材料"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2657
+msgid "Edit Electronics Shop"
+msgstr "编辑电子材料行"
+
+#: build/trans_presets.java:2662
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2663
+msgid "Edit Hifi Shop"
+msgstr "编辑 Hifi 音响店"
+
+#: build/trans_presets.java:2668
+msgid "Furniture"
+msgstr "家俱类"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2669
+msgid "Edit Furniture Shop"
+msgstr "编辑家俱店"
+
+#: build/trans_presets.java:2674
+msgid "Garden Centre"
+msgstr "园艺中心"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2676
+msgid "Edit Garden Centre"
+msgstr "编辑园艺中心"
+
+#: build/trans_presets.java:2681
+msgid "Hardware"
+msgstr "硬体"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2683
+msgid "Edit Hardware Store"
+msgstr "编辑硬体商店"
+
+#: build/trans_presets.java:2688
+msgid "Do-it-yourself-store"
+msgstr "DIY 商店"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2690
+msgid "Edit Do-it-yourself-store"
+msgstr "编辑 DIY 商店"
+
+#: build/trans_presets.java:2695
+msgid "Stationery"
+msgstr "文具类"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2696
+msgid "Edit Stationery Shop"
+msgstr "编辑文具店"
+
+#: build/trans_presets.java:2701
+msgid "Hairdresser"
+msgstr "美发类"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2702
+msgid "Edit Hairdresser"
+msgstr "编辑美发店"
+
+#: build/trans_presets.java:2707
+msgid "Shoes"
+msgstr "鞋类"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2708
+msgid "Edit Shoe Shop"
+msgstr "编辑鞋店"
+
+#: build/trans_presets.java:2713
+msgid "Toys"
+msgstr "玩具类"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2714
+msgid "Edit Toy Shop"
+msgstr "编辑玩具店"
+
+#: build/trans_presets.java:2719
+msgid "Video"
+msgstr "影片类"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2720
+msgid "Edit Video Shop"
+msgstr "编辑影片类商店"
+
+#: build/trans_presets.java:2725
+msgid "Dry Cleaning"
+msgstr "干洗类"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2727
+msgid "Edit Dry Cleaning"
+msgstr "编辑干洗店"
+
+#: build/trans_presets.java:2732
+msgid "Laundry"
+msgstr "洗衣店"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2734
+msgid "Edit Laundry"
+msgstr "编辑洗衣店"
+
+#: build/trans_presets.java:2739
+msgid "Outdoor"
+msgstr "户外用品"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2741
+msgid "Edit Outdoor Shop"
+msgstr "编辑户外用品店"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2747
+msgid "Edit Sports Shop"
+msgstr "编辑运动用品店"
+
+#: build/trans_presets.java:2752
+msgid "Optician"
+msgstr "眼镜类"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2753
+msgid "Edit Optician"
+msgstr "编辑眼镜行"
+
+#. <separator/>
+#: build/trans_presets.java:2759
+msgid "Vending machine"
+msgstr "自动贩卖机"
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:2761
+msgid "Edit Vending machine"
+msgstr "编辑自动贩卖机"
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:2763
+msgid "Vending products"
+msgstr "贩卖产品"
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:2763
+msgid "public_transport_tickets"
+msgstr ""
+
+#: build/trans_presets.java:2763
+msgid "public_transport_plans"
+msgstr ""
+
+#: build/trans_presets.java:2763
+msgid "parking_tickets"
+msgstr ""
+
+#: build/trans_presets.java:2763
+msgid "food"
+msgstr "食物"
+
+#: build/trans_presets.java:2763
+msgid "drinks"
+msgstr "饮料"
+
+#: build/trans_presets.java:2763
+msgid "sweets"
+msgstr "甜点"
+
+#: build/trans_presets.java:2763
+msgid "cigarettes"
+msgstr "菸"
+
+#: build/trans_presets.java:2763
+msgid "photos"
+msgstr "相片"
+
+#: build/trans_presets.java:2763
+msgid "animal_food"
+msgstr "饲料"
+
+#: build/trans_presets.java:2763
+msgid "news_papers"
+msgstr "报纸"
+
+#: build/trans_presets.java:2763
+msgid "toys"
+msgstr "玩具"
+
+#: build/trans_presets.java:2763
+msgid "stamps"
+msgstr "邮票"
+
+#: build/trans_presets.java:2763
+msgid "SIM-cards"
+msgstr "SIM-卡"
+
+#: build/trans_presets.java:2763
+msgid "telephone_vouchers"
+msgstr ""
+
+#: build/trans_presets.java:2763
+msgid "vouchers"
+msgstr ""
+
+#: build/trans_presets.java:2763
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:2763
+msgid "condoms"
+msgstr "保险套"
+
+#: build/trans_presets.java:2763
+msgid "tampons"
+msgstr ""
+
+#: build/trans_presets.java:2763
+msgid "excrement_bags"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:2772
+msgid "Account or loyalty cards"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:2775
+msgid "Cash"
+msgstr "现金"
+
+#. group "Cash"
+#: build/trans_presets.java:2776
+msgid "Bank"
+msgstr "银行"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:2778
+msgid "Edit Bank"
+msgstr "编辑银行"
+
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
+msgid "Automated Teller Machine"
+msgstr "自动提款机(ATM)"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:2785
+msgid "Money Exchange"
+msgstr "金钱兑换所"
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:2787
+msgid "Edit Money Exchange"
+msgstr "编辑金钱兑换所"
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:2794
+msgid "Edit Automated Teller Machine"
+msgstr "编辑自动提款机"
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:2799
+msgid "Health"
+msgstr "健康"
+
+#. group "Health"
+#: build/trans_presets.java:2800
+msgid "Doctors"
+msgstr "医师"
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:2802
+msgid "Edit Doctors"
+msgstr "编辑医师"
+
+#: build/trans_presets.java:2807
+msgid "Dentist"
+msgstr "牙医"
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:2808
+msgid "Edit Dentist"
+msgstr "编辑牙医"
+
+#: build/trans_presets.java:2813
+msgid "Pharmacy"
+msgstr "药局"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:2815
+msgid "Edit Pharmacy"
+msgstr "编辑药局"
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:2817
+msgid "Dispensing"
+msgstr "配药"
+
+#: build/trans_presets.java:2821
+msgid "Hospital"
+msgstr "医院"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:2823
+msgid "Edit Hospital"
+msgstr "编辑医院"
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:2827
+msgid "Emergency Access Point"
+msgstr "紧急连络点"
+
+#. item "Health/Emergency Access Point"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
+#: build/trans_presets.java:2830
+msgid "Edit Emergency Access Point"
+msgstr "编辑紧急连络点"
+
+#. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
+#. <space />
+#. <key key="highway" value="emergency_access_point" />
+#: build/trans_presets.java:2833
+msgid "Point Number"
+msgstr ""
+
+#. item "Health/Emergency Access Point" text "Point Number"
+#: build/trans_presets.java:2834
+msgid "Point Name"
+msgstr ""
+
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:2836
+msgid "Phone Number"
+msgstr "电话号码"
+
+#. item "Health/Emergency Access Point" text "Phone Number"
+#: build/trans_presets.java:2837
+msgid "(Use international code, like +12-345-67890)"
+msgstr "(使用国际码，像是 +12-345-67890)"
+
+#. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
+#. <space />
+#: build/trans_presets.java:2840
+msgid "Veterinary"
+msgstr "兽医"
+
+#. item "Health/Veterinary"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
+#: build/trans_presets.java:2843
+msgid "Edit Veterinary"
+msgstr "编辑兽医"
+
+#: build/trans_presets.java:2850
+msgid "Geography"
+msgstr "地理"
+
+#. group "Geography"
+#: build/trans_presets.java:2851
+msgid "Places"
+msgstr "地名"
+
+#. group "Geography/Places"
+#: build/trans_presets.java:2852
+msgid "Continent"
+msgstr "大洲"
+
+#. item "Geography/Places/Continent"
+#: build/trans_presets.java:2853
+msgid "Edit Continent"
+msgstr "编辑大洲"
+
+#. item "Geography/Places/Continent" text "Name"
+#: build/trans_presets.java:2858
+msgid "Country"
+msgstr "国家"
+
+#. item "Geography/Places/Country"
+#: build/trans_presets.java:2859
+msgid "Edit Country"
+msgstr "编辑国家"
+
+#. item "Geography/Places/Country" text "Name"
+#: build/trans_presets.java:2864
+msgid "State"
+msgstr "省/州"
+
+#. item "Geography/Places/State"
+#: build/trans_presets.java:2865
+msgid "Edit State"
+msgstr "编辑省/州"
+
+#. item "Geography/Places/State" text "Name"
+#: build/trans_presets.java:2870
+msgid "Region"
+msgstr "地区"
+
+#. item "Geography/Places/Region"
+#: build/trans_presets.java:2871
+msgid "Edit Region"
+msgstr "编辑地区"
+
+#. item "Geography/Places/Region" text "Name"
+#: build/trans_presets.java:2876
+msgid "County"
+msgstr "县"
+
+#. item "Geography/Places/County"
+#: build/trans_presets.java:2877
+msgid "Edit County"
+msgstr "编辑县"
+
+#. item "Geography/Places/County" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2883
+msgid "City"
+msgstr "市"
+
+#. item "Geography/Places/City"
+#: build/trans_presets.java:2884
+msgid "Edit City"
+msgstr "编辑市"
+
+#. item "Geography/Places/City" text "Name"
+#: build/trans_presets.java:2889
+msgid "Town"
+msgstr "镇"
+
+#. item "Geography/Places/Town"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
+#: build/trans_presets.java:2891
+msgid "Edit Town"
+msgstr "编辑镇"
+
+#. item "Geography/Places/Town" text "Name"
+#: build/trans_presets.java:2896
+msgid "Suburb"
+msgstr "郊区"
+
+#. item "Geography/Places/Suburb"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
+#: build/trans_presets.java:2898
+msgid "Edit Suburb"
+msgstr "编辑郊区"
+
+#. item "Geography/Places/Suburb" text "Name"
+#: build/trans_presets.java:2903
+msgid "Village"
+msgstr "村"
+
+#. item "Geography/Places/Village"
+#: build/trans_presets.java:2904
+msgid "Edit Village"
+msgstr "编辑村"
+
+#. item "Geography/Places/Village" text "Name"
+#: build/trans_presets.java:2909
+msgid "Hamlet"
+msgstr "自然村"
+
+#. item "Geography/Places/Hamlet"
+#: build/trans_presets.java:2910
+msgid "Edit Hamlet"
+msgstr "编辑自然村"
+
+#. item "Geography/Places/Hamlet" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2916
+msgid "Locality"
+msgstr ""
+
+#. item "Geography/Places/Locality"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
+#: build/trans_presets.java:2918
+msgid "Edit Locality"
+msgstr ""
+
+#. item "Geography/Places/Locality" text "Name"
+#: build/trans_presets.java:2923
+msgid "Island"
+msgstr "岛屿"
+
+#. item "Geography/Places/Island"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
+#: build/trans_presets.java:2925
+msgid "Edit Island"
+msgstr "编辑岛屿"
+
+#. item "Geography/Places/Island" text "Name"
+#: build/trans_presets.java:2930
+msgid "Islet"
+msgstr ""
+
+#. item "Geography/Places/Islet"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
+#: build/trans_presets.java:2932
+msgid "Edit Islet"
+msgstr ""
+
+#. item "Geography/Places/Islet" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2938
+msgid "Cave Entrance"
+msgstr "洞窟入口"
+
+#. item "Geography/Places/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:2940
+msgid "Edit Cave Entrance"
+msgstr "编辑洞窟入口"
+
+#. item "Geography/Places/Cave Entrance" text "Name"
+#: build/trans_presets.java:2944
+msgid "Peak"
+msgstr "峰"
+
+#. item "Geography/Places/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:2946
+msgid "Edit Peak"
+msgstr "编辑山峰"
+
+#. item "Geography/Places/Peak" text "Elevation"
+#: build/trans_presets.java:2951
+msgid "Glacier"
+msgstr "冰河"
+
+#. item "Geography/Places/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:2953
+msgid "Edit Glacier"
+msgstr "编辑冰河"
+
+#. item "Geography/Places/Glacier" text "Elevation"
+#: build/trans_presets.java:2958
+msgid "Volcano"
+msgstr "火山"
+
+#. item "Geography/Places/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:2960
+msgid "Edit Volcano"
+msgstr "编辑火山"
+
+#. item "Geography/Places/Volcano" text "Elevation"
+#: build/trans_presets.java:2966
+msgid "Boundaries"
+msgstr "边界"
+
+#. group "Boundaries"
+#: build/trans_presets.java:2967
+msgid "National"
+msgstr "国界"
+
+#. item "Boundaries/National"
+#: build/trans_presets.java:2968
+msgid "Edit National Boundary"
+msgstr "编辑国界"
+
+#. item "Boundaries/National" text "Name"
+#: build/trans_presets.java:2973
+msgid "Administrative"
+msgstr "行政区"
+
+#. item "Boundaries/Administrative"
+#: build/trans_presets.java:2974
+msgid "Edit Administrative Boundary"
+msgstr "编辑行政区边界"
+
+#. item "Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:2979
+msgid "Civil"
+msgstr "城市的"
+
+#. item "Boundaries/Civil"
+#: build/trans_presets.java:2980
+msgid "Edit Civil Boundary"
+msgstr "编辑城市边界"
+
+#. item "Boundaries/Civil" text "Name"
+#: build/trans_presets.java:2985
+msgid "Political"
+msgstr "政治的"
+
+#. item "Boundaries/Political"
+#: build/trans_presets.java:2986
+msgid "Edit Political Boundary"
+msgstr "编辑政治的边界"
+
+#. item "Boundaries/Political" text "Name"
+#: build/trans_presets.java:2991
+msgid "National park"
+msgstr "国家公园"
+
+#. item "Boundaries/National park"
+#: build/trans_presets.java:2992
+msgid "Edit National Park Boundary"
+msgstr "编辑国家公园"
+
+#. item "Boundaries/National park" text "Name"
+#: build/trans_presets.java:2998
+msgid "Land use"
+msgstr "土地利用"
+
+#. group "Land use"
+#: build/trans_presets.java:2999
+msgid "Tree"
+msgstr "树"
+
+#. item "Land use/Tree"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:3002
+msgid "Edit Tree"
+msgstr "编辑树"
+
+#. item "Land use/Tree" text "Height"
+#: build/trans_presets.java:3007
+msgid "Botanical Name"
+msgstr "植物学名"
+
+#. item "Land use/Tree" text "Botanical Name"
+#: build/trans_presets.java:3009
+msgid "Wood"
+msgstr ""
+
+#. item "Land use/Wood"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
+#: build/trans_presets.java:3012
+msgid "Edit Wood"
+msgstr ""
+
+#. item "Land use/Wood" combo "Type"
+#. item "Land use/Forest" combo "Type"
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
+msgid "coniferous"
+msgstr "松类"
+
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
+msgid "deciduous"
+msgstr "落叶类"
+
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
+msgid "mixed"
+msgstr "混合"
+
+#: build/trans_presets.java:3017
+msgid "Forest"
+msgstr "森林"
+
+#. item "Land use/Forest"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:3020
+msgid "Edit Forest Landuse"
+msgstr "编辑森林土地利用"
+
+#: build/trans_presets.java:3026
+msgid "Nature Reserve"
+msgstr "自然保育"
+
+#. item "Land use/Nature Reserve"
+#: build/trans_presets.java:3027
+msgid "Edit Nature Reserve"
+msgstr "编辑自然保育"
+
+#. item "Land use/Nature Reserve" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3032
+msgid "Scree"
+msgstr ""
+
+#. item "Land use/Scree"
+#: build/trans_presets.java:3033
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:3037
+msgid "Scrub"
+msgstr ""
+
+#. item "Land use/Scrub"
+#: build/trans_presets.java:3038
+msgid "Edit Scrub"
+msgstr ""
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:3042
+msgid "Fell"
+msgstr ""
+
+#. item "Land use/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3044
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:3048
+msgid "Heath"
+msgstr ""
+
+#. item "Land use/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3050
+msgid "Edit Heath"
+msgstr ""
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3055
+msgid "Farmyard"
+msgstr ""
+
+#. item "Land use/Farmyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
+#: build/trans_presets.java:3058
+msgid "Edit Farmyard Landuse"
+msgstr ""
+
+#. item "Land use/Farmyard" text "Name"
+#: build/trans_presets.java:3063
+msgid "Farmland"
+msgstr "农田"
+
+#. item "Land use/Farmland"
+#: build/trans_presets.java:3064
+msgid "Edit Farmland Landuse"
+msgstr "编辑农田土地利用"
+
+#. item "Land use/Farmland" text "Name"
+#: build/trans_presets.java:3069
+msgid "Meadow"
+msgstr "青草地"
+
+#. item "Land use/Meadow"
+#: build/trans_presets.java:3070
+msgid "Edit Meadow Landuse"
+msgstr "编辑青草地土地利用"
+
+#. item "Land use/Meadow" text "Name"
+#: build/trans_presets.java:3075
+msgid "Vineyard"
+msgstr ""
+
+#. item "Land use/Vineyard"
+#: build/trans_presets.java:3076
+msgid "Edit Vineyard Landuse"
+msgstr ""
+
+#. item "Land use/Vineyard" text "Name"
+#: build/trans_presets.java:3081
+msgid "Allotments"
+msgstr ""
+
+#. item "Land use/Allotments"
+#: build/trans_presets.java:3082
+msgid "Edit Allotments Landuse"
+msgstr ""
+
+#. item "Land use/Allotments" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3088
+msgid "Garden"
+msgstr "花园"
+
+#. item "Land use/Garden"
+#: build/trans_presets.java:3089
+msgid "Edit Garden"
+msgstr "编辑花园"
+
+#. item "Land use/Garden" text "Name"
+#: build/trans_presets.java:3093
+msgid "Grass"
+msgstr "草地"
+
+#. item "Land use/Grass"
+#: build/trans_presets.java:3094
+msgid "Edit Grass Landuse"
+msgstr ""
+
+#. item "Land use/Grass" text "Name"
+#: build/trans_presets.java:3099
+msgid "Village Green"
+msgstr ""
+
+#. item "Land use/Village Green"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
+#: build/trans_presets.java:3101
+msgid "Edit Village Green Landuse"
+msgstr ""
+
+#. item "Land use/Village Green" text "Name"
+#: build/trans_presets.java:3106
+msgid "Common"
+msgstr ""
+
+#. item "Land use/Common"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
+#: build/trans_presets.java:3108
+msgid "Edit Common"
+msgstr ""
+
+#. item "Land use/Common" text "Name"
+#: build/trans_presets.java:3112
+msgid "Park"
+msgstr "公园"
+
+#. item "Land use/Park"
+#: build/trans_presets.java:3113
+msgid "Edit Park"
+msgstr "编辑公园"
+
+#. item "Land use/Park" text "Name"
+#: build/trans_presets.java:3117
+msgid "Recreation Ground"
+msgstr "游乐场"
+
+#. item "Land use/Recreation Ground"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
+#: build/trans_presets.java:3119
+msgid "Edit Recreation Ground Landuse"
+msgstr "编辑游乐场用地"
+
+#. item "Land use/Recreation Ground" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3125
+msgid "Residential area"
+msgstr "居住区"
+
+#. item "Land use/Residential area"
+#: build/trans_presets.java:3126
+msgid "Edit Residential Landuse"
+msgstr "编辑居住区"
+
+#. item "Land use/Residential area" text "Name"
+#: build/trans_presets.java:3131
+msgid "Graveyard"
+msgstr "墓地(常在教堂附近)"
+
+#. item "Land use/Graveyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
+#: build/trans_presets.java:3133
+msgid "Edit Graveyard"
+msgstr "编辑墓地"
+
+#: build/trans_presets.java:3139
+msgid "Cemetery"
+msgstr "墓地(不靠近教堂)"
+
+#. item "Land use/Cemetery"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
+#: build/trans_presets.java:3141
+msgid "Edit Cemetery Landuse"
+msgstr "编辑墓地"
+
+#: build/trans_presets.java:3148
+msgid "Retail"
+msgstr "零售"
+
+#. item "Land use/Retail"
+#: build/trans_presets.java:3149
+msgid "Edit Retail Landuse"
+msgstr "编辑零售用地"
+
+#. item "Land use/Retail" text "Name"
+#: build/trans_presets.java:3154
+msgid "Commercial"
+msgstr "商业"
+
+#. item "Land use/Commercial"
+#: build/trans_presets.java:3155
+msgid "Edit Commercial Landuse"
+msgstr "编辑商业用地"
+
+#. item "Land use/Commercial" text "Name"
+#: build/trans_presets.java:3160
+msgid "Industrial"
+msgstr "工业"
+
+#. item "Land use/Industrial"
+#: build/trans_presets.java:3161
+msgid "Edit Industrial Landuse"
+msgstr "编辑工业用地"
+
+#. item "Land use/Industrial" text "Name"
+#: build/trans_presets.java:3166
+msgid "Railway land"
+msgstr "铁路用地"
+
+#. item "Land use/Railway land"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
+#: build/trans_presets.java:3168
+msgid "Edit Railway Landuse"
+msgstr "编辑铁路用地"
+
+#. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:3173
+msgid "Military"
+msgstr "军事"
+
+#. item "Land use/Military"
+#: build/trans_presets.java:3174
+msgid "Edit Military Landuse"
+msgstr "编辑军事用地"
+
+#. item "Land use/Military" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3180
+msgid "Construction area"
+msgstr "建筑区"
+
+#. item "Land use/Construction area"
+#: build/trans_presets.java:3181
+msgid "Edit Construction Landuse"
+msgstr "编辑建筑区"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3186
+msgid "Brownfield"
+msgstr ""
+
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3187
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3192
+msgid "Greenfield"
+msgstr "绿地"
+
+#. item "Land use/Greenfield"
+#: build/trans_presets.java:3193
+msgid "Edit Greenfield Landuse"
+msgstr "编辑绿地"
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:3198
+msgid "Landfill"
+msgstr "垃圾填埋场"
+
+#. item "Land use/Landfill"
+#: build/trans_presets.java:3199
+msgid "Edit Landfill Landuse"
+msgstr "编辑垃圾填埋场"
+
+#. item "Land use/Landfill" text "Name"
+#: build/trans_presets.java:3204
+msgid "Quarry"
+msgstr "采石场"
+
+#. item "Land use/Quarry"
+#: build/trans_presets.java:3205
+msgid "Edit Quarry Landuse"
+msgstr "编辑采石场"
+
+#. item "Relations/Multipolygon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
+#: build/trans_presets.java:3217
+msgid "Edit Multipolygon"
+msgstr "编辑多重多边形"
+
+#. item "Relations/Multipolygon" text "Name"
+#. </optional>
+#. <roles>
+#. item "Relations/Boundary" combo "Administrative level"
+#. </optional>
+#. <roles>
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
+msgid "outer segment"
+msgstr "外围"
+
+#. item "Relations/Multipolygon" role "outer segment"
+#. item "Relations/Boundary" role "outer segment"
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
+msgid "inner segment"
+msgstr "内围"
+
+#. item "Relations/Multipolygon" role "inner segment"
+#. </roles>
+#: build/trans_presets.java:3227
+msgid "Boundary"
+msgstr "边界"
+
+#. item "Relations/Boundary"
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
+#. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
+#: build/trans_presets.java:3232
+msgid "Edit Boundary"
+msgstr "编辑边界"
+
+#. item "Relations/Boundary" text "Name"
+#. <optional>
+#: build/trans_presets.java:3236
+msgid "Boundary type"
+msgstr "边界类型"
+
+#. item "Relations/Boundary" combo "Boundary type"
+#: build/trans_presets.java:3236
+msgid "administrative"
+msgstr "行政区界"
+
+#: build/trans_presets.java:3236
+msgid "national"
+msgstr "国界"
+
+#: build/trans_presets.java:3236
+msgid "civil"
+msgstr "市界"
+
+#: build/trans_presets.java:3236
+msgid "political"
+msgstr "政治分界"
+
+#: build/trans_presets.java:3237
+msgid "Administrative level"
+msgstr "行政区界等级"
+
+#. item "Relations/Boundary" role "inner segment"
+#: build/trans_presets.java:3242
+msgid "Sub area"
+msgstr "郊区"
+
+#. item "Relations/Boundary" role "Sub area"
+#: build/trans_presets.java:3243
+msgid "Administration centre"
+msgstr "行政中心"
+
+#. item "Relations/Boundary" role "Administration centre"
+#. </roles>
+#: build/trans_presets.java:3246
+msgid "Turn restriction"
+msgstr "转弯限制"
+
+#. item "Relations/Turn restriction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
+#: build/trans_presets.java:3249
+msgid "Edit Turn Restriction"
+msgstr "编辑转弯限制"
+
+#. item "Relations/Turn restriction" label "Edit Turn Restriction"
+#. <key key="type" value="restriction" />
+#: build/trans_presets.java:3251
+msgid "Restriction"
+msgstr "限制"
+
+#. item "Relations/Turn restriction" combo "Restriction"
+#: build/trans_presets.java:3251
+msgid "no_left_turn"
+msgstr "禁止左转"
+
+#: build/trans_presets.java:3251
+msgid "no_right_turn"
+msgstr "禁止右转"
+
+#: build/trans_presets.java:3251
+msgid "no_straight_on"
+msgstr "禁止直行"
+
+#: build/trans_presets.java:3251
+msgid "no_u_turn"
+msgstr "禁止掉头"
+
+#: build/trans_presets.java:3251
+msgid "only_right_turn"
+msgstr "只可右转"
+
+#: build/trans_presets.java:3251
+msgid "only_left_turn"
+msgstr "只可左转"
+
+#: build/trans_presets.java:3251
+msgid "only_straight_on"
+msgstr "只可直行"
+
+#. item "Relations/Turn restriction" text "Name"
+#. </optional>
+#. <roles>
+#: build/trans_presets.java:3256
+msgid "from way"
+msgstr "from 路径"
+
+#. item "Relations/Turn restriction" role "from way"
+#: build/trans_presets.java:3257
+msgid "via node or way"
+msgstr "via 节点或路径"
+
+#. item "Relations/Turn restriction" role "via node or way"
+#: build/trans_presets.java:3258
+msgid "to way"
+msgstr "to 路径"
+
+#. item "Relations/Turn restriction" role "to way"
+#. </roles>
+#: build/trans_presets.java:3261
+msgid "Route"
+msgstr "路线"
+
+#. item "Relations/Route"
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
+#: build/trans_presets.java:3264
+msgid "Edit Route"
+msgstr "编辑路线"
+
+#. item "Relations/Route" label "Edit Route"
+#. <key key="type" value="route" />
+#: build/trans_presets.java:3266
+msgid "Route type"
+msgstr "路线类型"
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated/official as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="official"/>
+#. <condition k="foot" v="official"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_style.java:689 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
+msgid "bicycle"
+msgstr "单车"
+
+#: build/trans_presets.java:3266
+msgid "bus"
+msgstr "公交车"
+
+#: build/trans_presets.java:3266
+msgid "road"
+msgstr "道路"
+
+#: build/trans_presets.java:3266
+msgid "ferry"
+msgstr "渡轮"
+
+#: build/trans_presets.java:3266
+msgid "ski"
+msgstr "滑雪"
+
+#. color bicycle
+#. <icon annotate="true" src="vehicle/restriction/bicycle-designated.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="foot" b="no"/>
+#. <icon src="vehicle/restriction/foot.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="footway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="foot" v="designated"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="foot" v="official"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="pedestrian"/>
+#. color foot
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="steps"/>
+#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:731 build/trans_style.java:739
+#: build/trans_style.java:764 build/trans_style.java:765
+#: build/trans_style.java:773
+msgid "foot"
+msgstr "步行"
+
+#: build/trans_presets.java:3266
+msgid "tram"
+msgstr "有轨电车"
+
+#: build/trans_presets.java:3266
+msgid "detour"
+msgstr ""
+
+#. color otherrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="subway"/>
+#: build/trans_presets.java:3266 build/trans_style.java:1233
+msgid "subway"
+msgstr "地铁"
+
+#. item "Relations/Route" text "Reference"
+#: build/trans_presets.java:3269
+msgid "Symbol description"
+msgstr ""
+
+#. item "Relations/Route" text "Description"
+#. <optional>
+#: build/trans_presets.java:3272
+msgid "Network"
+msgstr "网络"
+
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3274
+msgid "Route state"
+msgstr ""
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3274
+msgid "proposed"
+msgstr ""
+
+#: build/trans_presets.java:3274
+msgid "alternate"
+msgstr ""
+
+#: build/trans_presets.java:3274
+msgid "temporary"
+msgstr ""
+
+#: build/trans_presets.java:3274
+msgid "connection"
+msgstr "连接"
+
+#: build/trans_presets.java:3275
+msgid "Color (hex)"
+msgstr "颜色(16 进制)"
+
+#. item "Relations/Route" text "Color (hex)"
+#. </optional>
+#. <roles>
+#: build/trans_presets.java:3278
+msgid "route segment"
+msgstr ""
+
+#. item "Relations/Route" role "route segment"
+#: build/trans_presets.java:3279
+msgid "forward segment"
+msgstr ""
+
+#. item "Relations/Route" role "forward segment"
+#: build/trans_presets.java:3280
+msgid "backward segment"
+msgstr ""
+
+#. item "Relations/Route" role "backward segment"
+#: build/trans_presets.java:3281
+msgid "halt point"
+msgstr ""
+
+#. item "Relations/Route" role "halt point"
+#: build/trans_presets.java:3282
+msgid "forward halt point"
+msgstr ""
+
+#. item "Relations/Route" role "forward halt point"
+#: build/trans_presets.java:3283
+msgid "backward halt point"
+msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link       a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name       is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. mappaint style named "standard"
+#.
+#. <rule>
+#. <condition k="restriction" v="no_left_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="no_right_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="no_straight_on"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="no_u_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="only_left_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/only_left_turn.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="only_right_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/only_right_turn.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="only_straight_on"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/only_straight_on.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#.
+#. <!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->
+#. <rule>
+#. <condition k="oneway"/>
+#. <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" b="yes"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" v="viaduct"/>
+#. color bridge
+#. <icon annotate="true" src="vehicle/viaduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" v="aqueduct"/>
+#. color bridge
+#. <icon annotate="true" src="nautical/aqueduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" v="swing"/>
+#. color bridge
+#. <icon annotate="true" src="vehicle/viaduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="tunnel" b="yes"/>
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
+msgid "bridge"
+msgstr "桥"
+
+#. color bridge
+#. <icon annotate="true" src="vehicle/viaduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" b="no"/>
+#. color bridge
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="tunnel" b="no"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="cutting" b="no"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="embankment" b="no"/>
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="road"/>
+#. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--abutters tags -->
+#.
+#. <!--accessories tags -->
+#.
+#. <!--properties tags -->
+#.
+#. <rule>
+#. <condition k="mountain_pass" b="yes"/>
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:633 build/trans_style.java:4152
+msgid "deprecated"
+msgstr "已废弃"
+
+#. color foot
+#. <icon annotate="true" src="vehicle/restriction/foot-designated.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="goods" b="no"/>
+#. <icon src="vehicle/restriction/goods.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="hgv" b="no"/>
+#. <icon src="vehicle/restriction/goods.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="horse" b="no"/>
+#. <icon src="vehicle/restriction/horse.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="horse" v="designated"/>
+#. color service
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>20000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bridleway"/>
+#: build/trans_style.java:275 build/trans_style.java:681
+msgid "horse"
+msgstr "马"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="fence"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
+msgid "barrier"
+msgstr "障碍"
+
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="bump_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="sally_port"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="portcullis"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="spikes"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="bus_trap"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- highway tags -->
+#.
+#. <rule>
+#. <condition k="motorroad" v="yes"/>
+#: build/trans_style.java:548
+msgid "motorroad"
+msgstr "机动车专用道"
+
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- tracktype tags -->
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade1"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade2"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade3"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade4"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade5"/>
+#: build/trans_style.java:649 build/trans_style.java:976
+#: build/trans_style.java:984 build/trans_style.java:992
+#: build/trans_style.java:1000 build/trans_style.java:1008
+msgid "highway_track"
+msgstr ""
+
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="motorway_junction"/>
+#. <icon annotate="true" src="vehicle/exit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="services"/>
+#: build/trans_style.java:867
+msgid "services"
+msgstr ""
+
+#. color services
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="ford"/>
+#: build/trans_style.java:875
+msgid "ford"
+msgstr ""
+
+#. color ford
+#. <icon annotate="true" src="vehicle/ford.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bus_stop"/>
+#. <icon annotate="true" src="transport/bus_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="turning_circle"/>
+#: build/trans_style.java:890
+msgid "turningcircle"
+msgstr ""
+
+#. color construction
+#. <icon src="misc/construction.png" priority="10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:914
+msgid "emergency_access_point"
+msgstr "紧急连络点"
+
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="riverbank"/>
+#. color riverbank
+#: build/trans_style.java:1026 build/trans_style.java:1027
+msgid "riverbank"
+msgstr "河岸"
+
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="stream"/>
+#: build/trans_style.java:1043
+msgid "stream"
+msgstr "溪流"
+
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="dock"/>
+#: build/trans_style.java:1066
+msgid "dock"
+msgstr "码头"
+
+#. color dock
+#. <icon annotate="true" src="nautical/boatyard.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="lock_gate"/>
+#. <icon annotate="true" src="nautical/lock_gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="turning_point"/>
+#. <icon annotate="true" src="nautical/turning.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="boatyard"/>
+#. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="water_point"/>
+#. <icon annotate="true" src="accommodation/camping/water.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="waste_disposal"/>
+#. <icon annotate="true" src="accommodation/camping/wastewater.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="mooring"/>
+#. <icon annotate="true" src="nautical/marina.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="weir"/>
+#. <icon annotate="true" src="nautical/weir.png"/>
+#. color rapids
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="dam"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color manmade
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="waterfall"/>
+#. <icon annotate="true" src="nautical/waterfall.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--man_made tags -->
+#.
+#. <rule>
+#. <condition k="man_made" v="beacon"/>
+#. <icon annotate="true" src="misc/landmark/beacon.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="crane"/>
+#. color manmade
+#. <icon annotate="true" src="misc/landmark/crane.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="gasometer"/>
+#. <icon annotate="true" src="misc/landmark/gasometer.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="lighthouse"/>
+#. <icon annotate="true" src="misc/landmark/lighthouse.png"/>
+#. color pipeline
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="petroleum_well"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="reservoir_covered"/>
+#. <icon annotate="true" src="misc/landmark/reservoir_covered.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="surveillance"/>
+#. <icon annotate="true" src="misc/surveillance.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="survey_point"/>
+#. <icon annotate="true" src="misc/landmark/survey_point.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="tower"/>
+#. <icon annotate="true" src="misc/landmark/tower.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="wastewater_plant"/>
+#. color manmade
+#. <icon annotate="true" src="misc/landmark/wastewater_plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="watermill"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="water_tower"/>
+#. <icon annotate="true" src="misc/landmark/water_tower.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="windmill"/>
+#. <icon annotate="true" src="misc/landmark/windmill.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="works"/>
+#. <icon annotate="true" src="misc/landmark/works.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="water_works"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_style.java: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:1628
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
+#: build/trans_style.java:1692 build/trans_style.java:1700
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
+#: build/trans_style.java:1740 build/trans_style.java:1748
+#: build/trans_style.java:1756 build/trans_style.java:1764
+msgid "manmade"
+msgstr "人造"
+
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="rapids"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_style.java:1126
+msgid "rapids"
+msgstr "急流"
+
+#. color manmade
+#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- railway tags -->
+#.
+#. <rule>
+#. <condition k="railway" v="station"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/railway_station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="halt"/>
+#. <icon annotate="true" src="transport/railway_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="tram_station"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/railway_station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="tram_stop"/>
+#. <icon annotate="true" src="transport/railway_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="subway_entrance"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="crossing"/>
+#. color railwaypoint
+#. <icon annotate="true" src="vehicle/crossing_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="level_crossing"/>
+#: build/trans_style.java:1153 build/trans_style.java:1168
+#: build/trans_style.java:1183 build/trans_style.java:1191
+#: build/trans_style.java:1199
+msgid "railwaypoint"
+msgstr "铁路点"
+
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="tram"/>
+#. <!-- prefer way types over tram - draw tram as overlay in joined cases -->
+#. color railover
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="light_rail"/>
+#: build/trans_style.java:1216 build/trans_style.java:1225
+msgid "otherrail"
+msgstr "其他铁路"
+
+#. color otherrail
+#: build/trans_style.java:1217
+msgid "railover"
+msgstr ""
+
+#. color subway
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="preserved"/>
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
+#. <rule>
+#. <condition k="railway" v="disused"/>
+#. color oldrail
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
+#. <rule>
+#. <condition k="railway" v="abandoned"/>
+#. color oldrail
+#: build/trans_style.java:1241 build/trans_style.java:1251
+#: build/trans_style.java:1252 build/trans_style.java:1262
+#: build/trans_style.java:1263
+msgid "oldrail"
+msgstr "旧铁路"
+
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="service" v="yard"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="service" v="siding"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="service" v="spur"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--aeroway tags -->
+#.
+#. <rule>
+#. <condition k="aeroway" v="aerodrome"/>
+#. color aeroway
+#. color aeroway_dark
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="taxiway"/>
+#: build/trans_style.java:1343 build/trans_style.java:1344
+#: build/trans_style.java:1376
+msgid "aeroway"
+msgstr "机场"
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_style.java:1352
+msgid "terminal"
+msgstr "航站楼"
+
+#. color terminal
+#. <icon annotate="true" src="transport/airport/terminal.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="helipad"/>
+#. color aeroway_dark
+#. <icon annotate="true" src="transport/airport/helipad.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="runway"/>
+#: build/trans_style.java:1360 build/trans_style.java:1368
+msgid "aeroway_dark"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="apron"/>
+#: build/trans_style.java:1384
+msgid "aeroway_light"
+msgstr ""
+
+#. color aeroway_light
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="gate"/>
+#. <icon annotate="true" src="transport/airport/terminal.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--aerialway tags -->
+#.
+#. <rule>
+#. <condition k="aerialway" v="cable_car"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="chair_lift"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/chair_lift.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="drag_lift"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/drag_lift.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="station"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="pylon"/>
+#: build/trans_style.java: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
+msgid "aerialway"
+msgstr ""
+
+#. color aerialway
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- piste tags -->
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="easy"/>
+#. color piste_easy
+#: build/trans_style.java:1458 build/trans_style.java:1459
+msgid "piste_easy"
+msgstr ""
+
+#. color piste_easy
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="intermediate"/>
+#. color piste_intermediate
+#: build/trans_style.java:1467 build/trans_style.java:1468
+msgid "piste_intermediate"
+msgstr ""
+
+#. color piste_intermediate
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="advanced"/>
+#. color piste_advanced
+#: build/trans_style.java:1476 build/trans_style.java:1477
+msgid "piste_advanced"
+msgstr ""
+
+#. color piste_advanced
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1485 build/trans_style.java:1486
+msgid "piste_expert"
+msgstr ""
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="freeride"/>
+#. color piste_freeride
+#: build/trans_style.java:1494 build/trans_style.java:1495
+msgid "piste_freeride"
+msgstr ""
+
+#. color piste_freeride
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="novice"/>
+#. color piste_novice
+#: build/trans_style.java:1503 build/trans_style.java:1504
+msgid "piste_novice"
+msgstr ""
+
+#. color piste_novice
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>300000</scale_max>
+#. </rule>
+#.
+#. <!--power tags -->
+#.
+#. <rule>
+#. <condition k="power" v="tower"/>
+#. <icon annotate="true" src="misc/landmark/power/tower_small.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="sub_station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="wind"/>
+#. <icon annotate="true" src="misc/landmark/power/wind.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="hydro"/>
+#. <icon annotate="true" src="misc/landmark/power/hydro.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="fossil"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="nuclear"/>
+#. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="generator"/>
+#. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
+#: build/trans_style.java:1515 build/trans_style.java:1529
+#: build/trans_style.java:1537 build/trans_style.java:1546
+#: 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
+msgid "power"
+msgstr ""
+
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="pier"/>
+#. color pier
+#: build/trans_style.java:1667 build/trans_style.java:1668
+msgid "pier"
+msgstr ""
+
+#. color pier
+#. <icon annotate="true" src="nautical/pier.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="pipeline"/>
+#: build/trans_style.java:1676
+msgid "pipeline"
+msgstr "管道"
+
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--leisure tags -->
+#.
+#. <rule>
+#. <condition k="leisure" v="sports_centre"/>
+#. <icon annotate="true" src="sport/centre.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="golf_course"/>
+#. <icon annotate="true" src="sport/golf.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="stadium"/>
+#. <icon annotate="true" src="sport/stadium.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="track"/>
+#. <icon annotate="true" src="sport/track.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="pitch"/>
+#. <icon annotate="true" src="sport/pitch.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="water_park"/>
+#. <icon annotate="true" src="leisure/water_park.png"/>
+#. color marina
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="slipway"/>
+#. <icon annotate="true" src="nautical/slipway.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="fishing"/>
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="nature_reserve"/>
+#. <icon annotate="true" src="leisure/nature_reserve.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="park"/>
+#. <icon annotate="true" src="leisure/park.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="playground"/>
+#. <icon annotate="true" src="leisure/playground.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="garden"/>
+#. <icon annotate="true" src="leisure/garden.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="common"/>
+#. <icon annotate="true" src="leisure/common.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="swimming_pool"/>
+#. <icon annotate="true" src="sport/pool.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="miniature_golf"/>
+#. <icon annotate="true" src="sport/golf.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="dog_park"/>
+#. <icon annotate="true" src="leisure/dog.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="ice_rink"/>
+#. <icon annotate="true" src="sport/hockey.png"/>
+#: build/trans_style.java:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
+msgid "leisure"
+msgstr "休闲"
+
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="marina"/>
+#. <icon annotate="true" src="nautical/marina.png"/>
+#: build/trans_style.java:1822
+msgid "marina"
+msgstr "码头"
+
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--amenity tags -->
+#.
+#. <rule>
+#. <condition k="amenity" v="pub"/>
+#. <icon annotate="true" src="food/pub.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="biergarten"/>
+#. <icon annotate="true" src="food/biergarten.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="nightclub"/>
+#. <icon annotate="true" src="leisure/nightclub.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="stripclub"/>
+#. <icon annotate="true" src="leisure/stripclub.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="brothel"/>
+#. <icon annotate="true" src="leisure/stripclub.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="cafe"/>
+#. <icon annotate="true" src="food/cafe.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="restaurant"/>
+#. <icon annotate="true" src="food/restaurant.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="food_court"/>
+#. <icon annotate="true" src="food/restaurant.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fast_food"/>
+#. <icon annotate="true" src="food/fastfood.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bar"/>
+#. <icon annotate="true" src="food/bar.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="ice_cream"/>
+#. <icon annotate="true" src="food/icecream.png"/>
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
+msgid "amenity"
+msgstr ""
+
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="multi-storey"/>
+#. <icon annotate="true" src="vehicle/parking/multi-storey.png" priority="10000"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="underground"/>
+#. <icon annotate="true" src="vehicle/parking/underground.png" priority="10000"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="park_and_ride"/>
+#. <icon annotate="true" src="vehicle/parking/park_ride.png" priority="10000"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="parking"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bicycle_parking"/>
+#. <icon annotate="true" src="vehicle/parking/bicycle.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bicycle_rental"/>
+#. <icon annotate="true" src="vehicle/rental/bicycle.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="car_rental"/>
+#. <icon annotate="true" src="vehicle/rental/car.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="car_sharing"/>
+#. <icon annotate="true" src="vehicle/car_sharing.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="car_wash"/>
+#. color amenity_traffic
+#. <icon annotate="true" src="vehicle/car_wash.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="taxi"/>
+#. <icon annotate="true" src="transport/taxi.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fuel"/>
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
+msgid "amenity_traffic"
+msgstr ""
+
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="telephone"/>
+#. <icon annotate="true" src="service/telephone.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="emergency_phone"/>
+#. <icon annotate="true" src="vehicle/emergency_phone.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="toilets"/>
+#. <icon annotate="true" src="service/toilets.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="recycling"/>
+#. <icon annotate="true" src="service/recycling.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="public_building"/>
+#. <icon annotate="true" src="service.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="embassy"/>
+#. <icon annotate="true" src="service.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="townhall"/>
+#. <icon annotate="true" src="service.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="community_centre"/>
+#. <icon annotate="true" src="service.png"/>
+#. color light_water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="bahai"/>
+#. <icon annotate="true" src="religion/bahai.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="buddhist"/>
+#. <icon annotate="true" src="religion/buddhism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="christian"/>
+#. <icon annotate="true" src="religion/church.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="hindu"/>
+#. <icon annotate="true" src="religion/hinduism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="jain"/>
+#. <icon annotate="true" src="religion/jainism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="jewish"/>
+#. <icon annotate="true" src="religion/jewish.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="muslim"/>
+#. <icon annotate="true" src="religion/muslim.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="sikh"/>
+#. <icon annotate="true" src="religion/sikhism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="shinto"/>
+#. <icon annotate="true" src="religion/shinto.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="taoist"/>
+#. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="place_of_worship"/>
+#. <icon annotate="true" src="religion.png" priority="-10000"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grave_yard"/>
+#. <icon annotate="true" src="rendering/landuse/cemetery.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="crematorium"/>
+#. color amenity_light
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="post_office"/>
+#. <icon annotate="true" src="service/post_office.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="post_box"/>
+#. <icon annotate="true" src="service/post_box.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="school"/>
+#. <icon annotate="true" src="education/school.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="university"/>
+#. <icon annotate="true" src="education/university.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="college"/>
+#. <icon annotate="true" src="education/college.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="kindergarten"/>
+#. <icon annotate="true" src="education/kindergarten.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="driving_school"/>
+#. <icon annotate="true" src="education/driving_school.png"/>
+#. color health
+#. <icon annotate="true" src="health/veterinary.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="library"/>
+#. color amenity_light
+#. <icon annotate="true" src="shop/rental/library.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="police"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/police.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fire_station"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/firebrigade.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bus_station"/>
+#. <icon annotate="true" src="transport/bus.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="ferry_terminal"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="theatre"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/theater.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="cinema"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/cinema.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="arts_centre"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/arts_centre.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="courthouse"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/administration/court_of_law.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="prison"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/administration/prison.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bank"/>
+#. color amenity_light
+#. <icon annotate="true" src="money/bank.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bureau_de_change"/>
+#. color amenity_light
+#. <icon annotate="true" src="money/exchange.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="atm"/>
+#. color amenity_light
+#. <icon annotate="true" src="money/atm.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bench"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bench.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fire_hydrant"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/fire_hydrant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="shelter"/>
+#. color amenity_light
+#. <icon annotate="true" src="accommodation/shelter.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="hunting_stand"/>
+#. color amenity_light
+#. <icon annotate="true" src="hunting_stand.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="marketplace"/>
+#. color amenity_light
+#. <icon annotate="true" src="place/marketplace.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="wlan"/>
+#. <icon annotate="true" src="wlan.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="vending_machine"/>
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
+msgid "amenity_light"
+msgstr ""
+
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="drinking_water"/>
+#. <icon annotate="true" src="food/drinking_water.png"/>
+#. color light_water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fountain"/>
+#. <icon annotate="true" src="misc/landmark/spring.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--natural tags -->
+#.
+#. <rule>
+#. <condition k="natural" v="spring"/>
+#. <icon annotate="true" src="misc/landmark/spring.png"/>
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
+msgid "light_water"
+msgstr "自来水"
+
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="pharmacy"/>
+#. color health
+#. <icon annotate="true" src="health/pharmacy.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="hospital"/>
+#. color health
+#. <icon annotate="true" src="health/hospital.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="nursery"/>
+#. color health
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="doctors"/>
+#. color health
+#. <icon annotate="true" src="health/doctor.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="dentist"/>
+#. color health
+#. <icon annotate="true" src="health/dentist.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="veterinary"/>
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
+msgid "health"
+msgstr "医疗"
+
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--shop tags -->
+#.
+#. <rule>
+#. <condition k="shop" v="supermarket"/>
+#. <icon annotate="true" src="shop/supermarket.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="convenience"/>
+#. <icon annotate="true" src="shop/supermarket.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="bakery"/>
+#. <icon annotate="true" src="shop/groceries/bakery.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="butcher"/>
+#. <icon annotate="true" src="shop/groceries/butcher.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="bicycle"/>
+#. <icon annotate="true" src="sport/bicycle.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="doityourself"/>
+#. <icon annotate="true" src="shop/diy_store.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="dry_cleaning"/>
+#. <icon annotate="true" src="shop/laundry.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="laundry"/>
+#. <icon annotate="true" src="shop/laundry.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="outdoor"/>
+#. <icon annotate="true" src="shop/sports/outdoor.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="kiosk"/>
+#. <icon annotate="true" src="shop/kiosk.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="beverages"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="books"/>
+#. <icon annotate="true" src="shop/rental/library.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="car"/>
+#. <icon annotate="true" src="transport/car.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="car_dealer"/>
+#. <icon annotate="true" src="transport/car.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="car_repair"/>
+#. <icon annotate="true" src="transport/car.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="chemist"/>
+#. <icon annotate="true" src="shop/chemist.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="clothes"/>
+#. <icon annotate="true" src="shop/clothes.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="computer"/>
+#. <icon annotate="true" src="shop/computer.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="cycle_repair"/>
+#. <icon annotate="true" src="sport/bicycle.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="department_store"/>
+#. <icon annotate="true" src="shop/mall.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="electronics"/>
+#. <icon annotate="true" src="shop/electronics.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="furniture"/>
+#. <icon annotate="true" src="shop/furniture.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="florist"/>
+#. <icon annotate="true" src="shop/florist.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="groceries"/>
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="garden_centre"/>
+#. <icon annotate="true" src="shop/garden_centre.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="hairdresser"/>
+#. <icon annotate="true" src="shop/hairdresser.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="hardware"/>
+#. <icon annotate="true" src="shop/diy_store.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="hifi"/>
+#. <icon annotate="true" src="shop/hifi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="jewelry"/>
+#. <icon annotate="true" src="shop/jewelry.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="mall"/>
+#. <icon annotate="true" src="shop/mall.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="motorcycle"/>
+#. <icon annotate="true" src="vehicle/motorbike.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="newsagent"/>
+#. <icon annotate="true" src="shop/kiosk.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="organic"/>
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="optician"/>
+#. <icon annotate="true" src="shop/optician.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="shoes"/>
+#. <icon annotate="true" src="shop/shoes.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="tailor"/>
+#. <icon annotate="true" src="shop/tailor.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="travel_agency"/>
+#. <icon annotate="true" src="place/island.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="toys"/>
+#. <icon annotate="true" src="shop/toys.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="video"/>
+#. <icon annotate="true" src="shop/video.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
+#. <icon annotate="true" src="shop/mall.png"/>
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
+msgid "shop"
+msgstr "商店"
+
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--tourism tags -->
+#.
+#. <rule>
+#. <condition k="tourism" v="hotel"/>
+#. <icon annotate="true" src="accommodation.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="motel"/>
+#. <icon annotate="true" src="accommodation/motel.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="guest_house"/>
+#. <icon annotate="true" src="accommodation/guest_house.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="hostel"/>
+#. <icon annotate="true" src="accommodation/hostel.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="chalet"/>
+#. <icon annotate="true" src="accommodation/chalet.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="camp_site"/>
+#. <icon annotate="true" src="accommodation/camping.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="caravan_site"/>
+#. <icon annotate="true" src="accommodation/camping/caravan.png"/>
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
+msgid "hotel"
+msgstr "旅馆"
+
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="picnic_site"/>
+#. <icon annotate="true" src="leisure/picnic.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="viewpoint"/>
+#. <icon annotate="true" src="sightseeing/viewpoint.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="theme_park"/>
+#. <icon annotate="true" src="leisure/theme_park.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="attraction"/>
+#. <icon annotate="true" src="sightseeing.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="zoo"/>
+#. <icon annotate="true" src="leisure/zoo.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="artwork"/>
+#. <icon annotate="true" src="service/arts_centre.png"/>
+#. color tourism
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="museum"/>
+#. <icon annotate="true" src="sightseeing/museum.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- information tags -->
+#. <rule>
+#. <condition k="information" v="guidepost"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="office"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="map"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="board"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="information"/>
+#. <icon annotate="true" src="misc/information.png"/>
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
+msgid "tourism"
+msgstr "旅游"
+
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--historic tags -->
+#.
+#. <rule>
+#. <condition k="historic" v="castle"/>
+#. <icon annotate="true" src="sightseeing/castle.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="monument"/>
+#. <icon annotate="true" src="sightseeing/monument.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="memorial"/>
+#. <icon annotate="true" src="sightseeing/memorial.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="archaeological_site"/>
+#. <icon annotate="true" src="sightseeing/archaeological.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="ruins"/>
+#. <icon annotate="true" src="sightseeing/ruins.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="battlefield"/>
+#. <icon annotate="true" src="sightseeing/battlefield.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="geological" v="palaeontological_site"/>
+#. <icon annotate="true" src="historic/palaeontological_site.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="wayside_cross"/>
+#. <icon annotate="true" src="religion/wayside_cross.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="wayside_shrine"/>
+#. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
+#: build/trans_style.java:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
+msgid "historic"
+msgstr "古迹"
+
+#. color green
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="quarry"/>
+#: build/trans_style.java:3237
+msgid "quarry"
+msgstr "采石场"
+
+#. color quarry
+#. <icon src="misc/landmark/mine.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="landfill"/>
+#: build/trans_style.java:3245
+msgid "landfill"
+msgstr "垃圾填埋场"
+
+#. color landfill
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="basin"/>
+#. color basin
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="reservoir"/>
+#: build/trans_style.java:3253 build/trans_style.java:3261
+msgid "basin"
+msgstr ""
+
+#. color residential
+#. <icon src="misc/landuse/residential.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="farmyard"/>
+#: build/trans_style.java:3301
+msgid "farmyard"
+msgstr "农家庭院"
+
+#. color farmyard
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#.
+#. <rule>
+#. <condition k="landuse" v="retail"/>
+#. color retail
+#. <icon src="shop/mall.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="commercial"/>
+#: build/trans_style.java:3310 build/trans_style.java:3318
+msgid "retail"
+msgstr "零售"
+
+#. color retail
+#. <icon src="misc/landuse/commercial.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="industrial"/>
+#: build/trans_style.java:3326
+msgid "industrial"
+msgstr "产业"
+
+#. color industrial
+#. <icon src="misc/landmark/works.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="brownfield"/>
+#: build/trans_style.java:3334
+msgid "brownfield"
+msgstr "棕色地带 (待重新开发的城市用地)"
+
+#. color brownfield
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="greenfield"/>
+#: build/trans_style.java:3342
+msgid "greenfield"
+msgstr "绿地"
+
+#. color greenfield
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="railway"/>
+#: build/trans_style.java:3350
+msgid "railland"
+msgstr "铁路用地"
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="military"/>
+#. color green
+#. <icon src="leisure/common.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--military tags -->
+#.
+#. <rule>
+#. <condition k="military" v="airfield"/>
+#. <icon src="transport/airport/airfield.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="bunker"/>
+#. <icon src="misc/landmark/bunker.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="barracks"/>
+#. <icon src="misc/no_icon.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="danger_area"/>
+#. <icon src="misc/danger.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="range"/>
+#. <icon src="misc/landmark/range.png"/>
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
+msgid "military"
+msgstr ""
+
+#. color military
+#. <icon src="vehicle/tank.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="cemetery"/>
+#: build/trans_style.java:3375
+msgid "cemetery"
+msgstr ""
+
+#. color light_water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="peak"/>
+#: build/trans_style.java:3451
+msgid "peak"
+msgstr "山峰"
+
+#. color peak
+#. <icon annotate="true" src="misc/landmark/peak_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="glacier"/>
+#. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
+#: build/trans_style.java:3460
+msgid "glacier"
+msgstr ""
+
+#. color glacier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="volcano"/>
+#. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
+#: build/trans_style.java:3468
+msgid "volcano"
+msgstr "火山"
+
+#. color volcano
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="cliff"/>
+#. <icon src="misc/no_icon.png"/>
+#. color natural
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="scree"/>
+#. <icon src="misc/no_icon.png"/>
+#. color scrub
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="fell"/>
+#. <icon src="misc/no_icon.png"/>
+#. color beach
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="bay"/>
+#. <icon src="misc/no_icon.png"/>
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="land"/>
+#. <icon src="misc/no_icon.png"/>
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="cave_entrance"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
+msgid "natural"
+msgstr "自然"
+
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="scrub"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3493
+msgid "scrub"
+msgstr "灌木丛"
+
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="heath"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3509
+msgid "heath"
+msgstr "荒野"
+
+#. color heath
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wood"/>
+#. <icon src="misc/landmark/trees.png"/>
+#: build/trans_style.java:3517
+msgid "woodarea"
+msgstr "树林区"
+
+#. color water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="mud"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3549
+msgid "mud"
+msgstr "泥沼"
+
+#. color mud
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="beach"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3557
+msgid "beach"
+msgstr "海滩"
+
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="tree"/>
+#. <icon src="misc/landmark/trees.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--route tags -->
+#.
+#. <rule>
+#. <condition k="route" v="bus"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ferry"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="flight"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ncn"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="subsea"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ski"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="tour"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="pub_crawl"/>
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+msgid "route"
+msgstr "路线"
+
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--boundary tags -->
+#.
+#. <rule>
+#. <condition k="boundary" v="national"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="administrative"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="civil"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="political"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="national_park"/>
+#: build/trans_style.java:3663 build/trans_style.java:3671
+#: build/trans_style.java:3675 build/trans_style.java:3679
+#: build/trans_style.java:3683 build/trans_style.java:3687
+#: build/trans_style.java:3691 build/trans_style.java:3695
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
+msgid "boundary"
+msgstr "边界"
+
+#. color deprecated
+#. <icon src="misc/landmark/mountain_pass.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
+#. XXX - maybe it's possible to use linemod's here?
+#. <rule>
+#. <condition k="surface" v="paved"/>
+#. <linemod mode="under" width="0" dashedcolour="#505050"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="surface" v="unpaved"/>
+#. <linemod mode="under" width="0" dashedcolour="#301000"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="surface" v="gravel"/>
+#. <linemod mode="under" width="0" dashedcolour="#100070"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="surface" v="cobblestone"/>
+#. <linemod mode="under" width="0" dashedcolour="#600060"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. -->
+#.
+#. <!--name tags -->
+#.
+#. <!--preferences tags -->
+#.
+#. <!--place tags -->
+#.
+#. <rule>
+#. <condition k="place" v="continent"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="country"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="state"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="region"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="county"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="city"/>
+#. <icon annotate="true" src="place/settlement/city.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="town"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="village"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="hamlet"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="suburb"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="locality"/>
+#. <icon annotate="true" src="place/locality.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="island"/>
+#. <icon annotate="true" src="place/island.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="islet"/>
+#. <icon annotate="true" src="place/islet.png"/>
+#: build/trans_style.java:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
+msgid "place"
+msgstr "地点"
+
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#: build/trans_style.java:4304
+msgid "tiger_data"
+msgstr ""
+
+#. <?xml version="1.0"?>
+#. <surveyor columns="4" width="1300" height="0">
+#. <!-- icons can either be absolute paths or relative paths to the .josm directory -->
+#. <!-- action class: either fully qualified classnames or if not found,
+#. package at.dallermassl.josm.plugin.surveyor.action is assumed -->
+#: build/trans_surveyor.java:6
+msgid "Tunnel Start"
+msgstr "隧道开始"
+
+#. <button label="Bridge" hotkey="B" type="toggle">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="bridge"/>
+#. </button>
+#: build/trans_surveyor.java:16
+msgid "Village/City"
+msgstr "村/市"
+
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
+#. <!--action class="SetNodeAction" params="amenity=parking"/-->
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Parking"/>
+#. </button>
+#: build/trans_surveyor.java:29
+msgid "One Way"
+msgstr "单行道"
+
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="oneway=yes"/>
+#. </button>
+#: build/trans_surveyor.java:33
+msgid "Church"
+msgstr "教堂"
+
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
+#. <action class="SetWaypointAction" params="Church"/>
+#. </button>
+#: build/trans_surveyor.java:38
+msgid "Fuel Station"
+msgstr "加油站"
+
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetNodeAction" params="amenity=restaurant"/>
+#. <action class="SetWaypointAction" params="Restaurant"/>
+#. </button>
+#: build/trans_surveyor.java:52
+msgid "Shopping"
+msgstr "购物"
+
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Info"/>
+#. </button>
+#: build/trans_surveyor.java:56
+msgid "WC"
+msgstr "厕所"
+
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Info"/>
+#. </button>
+#: build/trans_surveyor.java:60
+msgid "Camping"
+msgstr "露营"
+
+#. <button label="Residential" hotkey="5">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Residential"/>
+#. </button>
+#. <!--
+#. <button label="Test" hotkey="shift X">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Test X"/>
+#. </button>
+#: build/trans_surveyor.java:93 build/trans_surveyor.java:97
+msgid "Test"
+msgstr "测试"
+
+#. JOSM TagChecker validator file
+#. Format:
+#. Each line specifies a certain error to be reported
+#. <data type> : messagetype : <key><expression><value>
+#.
+#. Data type can be:
+#. node        - a node point
+#. way         - a way
+#. relation    - a relation
+#. *           - all data types
+#.
+#. Message type can be:
+#. E            - an error
+#. W            - a warning
+#. I            - an low priority informational warning
+#.
+#. Key and value are expressions describing certain keys and values of these keys.
+#. Regulator expressions are supported. In this case the expressions starts and
+#. ends with // signs. If an 'i' is appended, the regular expression is
+#. case insensitive.
+#.
+#. The * sign indicates any string.
+#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
+#. handling for boolean values (yes, true, 0, false, no, ...).
+#.
+#. Expression can be:
+#. !=          - the key/value combination does not match
+#. ==          - the key/value combination does match
+#.
+#. To have more complicated expressions, multiple elements can be grouped together
+#. with an logical and (&&).
+#.
+#. The comment at the end of a rule is displayed in validator description
+#.
+#. Empty lines and space signs are ignored
+#: build/trans_validator.java:38
+msgid "abbreviated street name"
+msgstr "缩写的街道名称"
+
+#. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
+#: build/trans_validator.java:40
+msgid "oneway tag on a node"
+msgstr "节点上有单行道标签"
+
+#. node : W : oneway == *
+#: build/trans_validator.java:41
+msgid "bridge tag on a node"
+msgstr "节点上有桥梁标签"
+
+#. node : W : bridge == BOOLEAN_TRUE
+#. node : W : highway == tertiary
+#. node : W : highway == secondary
+#. node : W : highway == residential
+#. node : W : highway == unclassified
+#: build/trans_validator.java:42 build/trans_validator.java:43
+#: build/trans_validator.java:44 build/trans_validator.java:45
+#: build/trans_validator.java:46
+msgid "wrong highway tag on a node"
+msgstr "节点上错误的公路标签"
+
+#. node : W : highway == track
+#: build/trans_validator.java:47
+msgid "Unnamed unclassified highway"
+msgstr "未标名的未分类道路"
+
+#. way  : W : highway == unclassified && name != *
+#. way  : I : highway == secondary && ref != *
+#. way  : I : highway == tertiary && ref != *
+#: build/trans_validator.java:48 build/trans_validator.java:49
+#: build/trans_validator.java:50
+msgid "highway without a reference"
+msgstr "没有编号参照的公路"
+
+#. way  : I : highway == motorway && nat_ref != *
+#: build/trans_validator.java:51
+msgid "temporary highway type"
+msgstr ""
+
+#. *    : W : highway == road
+#: build/trans_validator.java:52
+msgid "misspelled key name"
+msgstr "拼错的键名"
+
+#. *    : W : / *name */i == * && name != *
+#. The following could replace unnamed way check. Still at the moment we keep it as it is
+#. way  : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction
+#. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
+#: build/trans_validator.java:58
+msgid "cycleway with tag bicycle"
+msgstr ""
+
+#. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
+#: build/trans_validator.java:59
+msgid "footway with tag foot"
+msgstr ""
+
+#. way  : W : highway == footway && foot == BOOLEAN_FALSE
+#. way  : I : highway == cycleway && bicycle == *                 # cycleway with tag bicycle
+#. way  : I : highway == footway && foot == *                     # footway with tag foot
+#: build/trans_validator.java:62
+msgid "separate cycleway as lane on a cycleway"
+msgstr ""
+
+#. way  : W : highway == cycleway && cycleway == lane
+#: build/trans_validator.java:63
+msgid "barrier used on a way"
+msgstr ""
+
+#. way  : W : highway == * && barrier == *
+#. way  : I : waterway == * && layer != *                         # waterway without layer tag
+#. way  : I : highway == footway && maxspeed == *
+#: build/trans_validator.java:66 build/trans_validator.java:67
+msgid "maxspeed used for footway"
+msgstr ""
+
+#. way  : I : highway == steps && maxspeed == *
+#: build/trans_validator.java:69
+msgid "layer tag with + sign"
+msgstr ""
+
+#. *    : W : layer == /\+.*/
+#: build/trans_validator.java:71
+msgid "street name contains ss"
+msgstr ""
+
+#. *    : I : name == /.*Strasse.*/i
+#: build/trans_validator.java:73
+msgid "relation without type"
+msgstr ""
+
+#. relation : E : type != *
+#: build/trans_validator.java:75
+msgid "restaurant without name"
+msgstr ""
+
+#. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
+#. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
+#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:78 build/trans_validator.java:79
+msgid "unusual tag combination"
+msgstr ""
+
+#. FORMAT
+#. default(true or false);Name;URL
+#. NOTE: default items should be common and worldwide
+#.
+#: build/trans_wms.java:5
+msgid "Landsat"
+msgstr ""
+
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
+#: build/trans_wms.java:6
+msgid "Open Aerial Map"
+msgstr "开放航空图"
+
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:10
+msgid "Yahoo Sat"
+msgstr "Yahoo Sat"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
+#: build/trans_wms.java:11
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
+#: build/trans_wms.java:12
+msgid "OpenCycleMap"
+msgstr "OpenCycleMap"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
+#: build/trans_wms.java:13
+msgid "TilesAtHome"
+msgstr "TilesAtHome"
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
+#. only for Germany
+#: build/trans_wms.java:17
+msgid "Streets NRW Geofabrik.de"
+msgstr ""
+
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#.
+#.
+#. only for North America
+#. Terraserver USCG - High resolution maps
+#: build/trans_wms.java:22
+msgid "Terraserver Topo"
+msgstr ""
+
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
+#: build/trans_wms.java:23
+msgid "Terraserver Urban"
+msgstr ""
+
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
+#.
+#.
+#. only for Czech Republic
+#: build/trans_wms.java:27
+msgid "Czech CUZK:KM"
+msgstr ""
+
+#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
+#: build/trans_wms.java:28
+msgid "Czech UHUL:ORTOFOTO"
+msgstr ""
+
+#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
+#.
+#.
+#. only for GB
+#. fails with division by zero error
+#: build/trans_wms.java:33
+msgid "NPE Maps"
+msgstr ""
+
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
+#: build/trans_wms.java:34
+msgid "NPE Maps (Tim)"
+msgstr ""
+
+#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
+#: build/trans_wms.java:35
+msgid "7th Series (OS7)"
+msgstr ""
+
+#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
+#.
+#.
+#. only for Japan
+#: build/trans_wms.java:39
+msgid "MLIT Japan (ORTHO)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:40
+msgid "MLIT Japan (ORTHO01)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:41
+msgid "MLIT Japan (ORTHO02)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:42
+msgid "MLIT Japan (ORTHO03)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#.
+#.
+#. only for Italy
+#: build/trans_wms.java:46
+msgid "Lodi - Italy"
+msgstr ""
+
+#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
+#: build/trans_wms.java:47
+msgid "Sicily - Italy"
+msgstr ""
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "选取的路径未包含选取的节点。"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "度-分-秒格式"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "请输入上传备注(最小3 个字节)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "请输入这个上传更改组合的注解 (最少 3 个字节)"
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 22568)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 22569)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 11:53+0200\n"
-"PO-Revision-Date: 2010-07-27 04:35+0000\n"
+"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"PO-Revision-Date: 2010-07-28 11:24+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-07-28 09:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-04 16:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -24,5 +24,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:213
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
@@ -53,14 +53,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:456
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
@@ -77,9 +76,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:489
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -122,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -160,5 +159,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:31
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -232,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:79
@@ -246,5 +245,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -264,11 +263,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:436
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
@@ -276,20 +276,20 @@
 #: ../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/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:88
@@ -322,5 +322,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
 msgid "Merge"
 msgstr "合併"
@@ -388,5 +388,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
@@ -400,5 +400,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
@@ -420,4 +420,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -434,6 +435,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:237
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -445,5 +446,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:462
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:901
@@ -578,22 +579,22 @@
 msgstr "正在下載開放的變更組合..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine Way"
 msgstr "合併路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "合併多個路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid "Change directions?"
 msgstr "改變路徑方向?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:60
 msgid "Reverse and Combine"
 msgstr "反轉後組合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:62
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -601,5 +602,5 @@
 msgstr "以這些路徑目前的方向是不能組合的。是否要將它們中的一部分反轉？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -607,10 +608,10 @@
 msgstr "不能組合路徑（它們無法合併為節點的單一字串）"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:222
 #, java-format
 msgid "Combine {0} ways"
 msgstr "組合 {0} 條路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:236
 msgid "Please select at least two ways to combine."
 msgstr "請選擇至少兩個以上的路徑來合併"
@@ -655,10 +656,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:386
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663
+#: ../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/PluginPreference.java:507
@@ -796,5 +797,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 msgid "Duplicate"
@@ -860,10 +861,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:316
 msgid "Export to GPX..."
 msgstr "匯出到 GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:315
 msgid "Export the data to GPX file."
 msgstr "匯出資料到 GPX 檔案"
@@ -1052,5 +1053,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "URL"
 msgstr "URL"
@@ -1470,20 +1471,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1135
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:920
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:228
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:469
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/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/tagging/TaggingPreset.java:808
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:809
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1507,5 +1508,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:200
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:90
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:98
@@ -1516,6 +1517,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:319
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:460
 msgid "Error"
 msgstr "錯誤"
@@ -1542,5 +1543,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 #: build/specialmessages.java:65
 msgid "Save"
@@ -1548,5 +1549,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:285
 msgid "Save the current data."
 msgstr "儲存現在的資料"
@@ -1601,10 +1602,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:301
 msgid "Save As..."
 msgstr "另存檔案..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:300
 msgid "Save the current data to a new file."
 msgstr "將目前的資料儲存為新的檔案。"
@@ -1647,5 +1648,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:967
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
 msgid "Close"
@@ -1672,5 +1673,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:221
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:222
 msgid "No, abort"
 msgstr "否，中止"
@@ -1737,23 +1738,29 @@
 msgstr[0] "簡化路徑（移除 {0} 個節點）"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
 msgid "Split Way"
 msgstr "切割路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
 msgstr "在選取的節點上切割路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
-msgid "The current selection cannot be used for splitting."
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
+#, fuzzy
+msgid ""
+"The current selection cannot be used for splitting - no node is selected."
 msgstr "不能在選取的節點上切割路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
+msgid "The selected nodes do not share the same way."
+msgstr "選取的節點不在同一個路徑上。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:136
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "選取的節點不在任何路徑上"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1764,19 +1771,10 @@
 msgstr[0] "節點上不只有兩個路徑。請同時選取你想切割的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
-msgid "The selected nodes do not share the same way."
-msgstr "選取的節點不在同一個路徑上。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "選取的路徑未包含選取的節點。"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
 msgid "You must select two or more nodes to split a circular way."
 msgstr "你必須選擇兩個以上的節點來切割一個環狀路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:273
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1784,5 +1782,5 @@
 msgstr "此路徑不能從選取的節點分割。（提示：選取的節點在路徑的中央。）"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1792,5 +1790,5 @@
 "它。</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:455
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1800,5 +1798,5 @@
 "correct it when necessary.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:462
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1944,5 +1942,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1045
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:830
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:231
 msgid "Download data"
@@ -2930,22 +2928,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../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/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:64
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:47
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:116
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
@@ -3087,25 +3085,25 @@
 msgstr "不能未決定的衝突"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:108
 msgid "At least one object to delete required, got empty collection"
 msgstr "至少要刪除一個物件，卻收到空白集合"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #, java-format
 msgid "Delete node {0}"
 msgstr "刪除節點 {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:156
 #, java-format
 msgid "Delete way {0}"
 msgstr "刪除路徑 {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
 #, java-format
 msgid "Delete relation {0}"
 msgstr "刪除關係 {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:170
 #, java-format
 msgid "Delete {0} object"
@@ -3113,5 +3111,5 @@
 msgstr[0] "刪除 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #, java-format
 msgid "Delete {0} node"
@@ -3119,5 +3117,5 @@
 msgstr[0] "刪除 {0} 個節點"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
 #, java-format
 msgid "Delete {0} way"
@@ -3125,5 +3123,5 @@
 msgstr[0] "刪除 {0} 個路徑"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
 #, java-format
 msgid "Delete {0} relation"
@@ -3131,5 +3129,5 @@
 msgstr[0] "刪除 {0} 個關係"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:193
 #, java-format
 msgid "Deleted ''{0}''"
@@ -3279,5 +3277,5 @@
 msgstr "是否接受？"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:201
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:209
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3352,17 +3350,17 @@
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr "從目錄 {0} 取得檔案時發生錯誤\n"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr "是否覆蓋舊的備份檔案？"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr "建立快取目錄時發生錯誤：{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
@@ -3534,42 +3532,45 @@
 
 #. *
-#. * the minutes/seconds format 99" 99'
+#. * the degrees/minutes/seconds format 9° 99" 99'
 #.
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "度-分-秒格式"
+msgid "deg° min'' sec\""
+msgstr ""
+
+#. *
+#. * the nautical format
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "deg° min'' (Nautical)"
+msgstr ""
 
 #. *
 #. * coordinates East/North
 #.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:30
 msgid "Projected Coordinates"
 msgstr "投影的坐標"
 
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
 msgctxt "compass"
 msgid "S"
 msgstr "南"
 
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:102
 msgctxt "compass"
 msgid "N"
 msgstr "北"
 
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:117
 msgctxt "compass"
 msgid "W"
 msgstr "西"
 
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:118
 msgctxt "compass"
 msgid "E"
 msgstr "東"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:242
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
 #, java-format
 msgid ""
@@ -3577,5 +3578,5 @@
 msgstr "無法將原型 {0} 加入資料組合，因為它已在其中"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:700
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
 #, java-format
 msgid ""
@@ -3743,5 +3744,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:172
 msgid "background"
 msgstr "背景"
@@ -3885,5 +3886,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:64
 msgid "Do not show again (remembers choice)"
 msgstr "不要再顯示（記住選擇）"
@@ -3911,5 +3912,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "railway"
 msgstr "鐵路"
@@ -3931,6 +3932,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:460
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:416
 #, java-format
 msgid "{0} node"
@@ -3998,5 +3999,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:4349
+#: build/trans_style.java:4357
 msgid "building"
 msgstr "建築"
@@ -4082,5 +4083,5 @@
 msgstr "物件已刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:488
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
@@ -4179,69 +4180,69 @@
 msgstr "密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "選項"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "顯示此說明訊息"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "標準 unix 幾何引數"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "下載此綁定方塊"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "於此 url 下載位置 (具有 lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "開啟檔案（任何可以使用 檔案/開啟 來開啟的檔案類型）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "下載綁定方塊做為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "將 url (lat=x&lon=y&zoom=z) 的位置下載為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "選取指定的搜尋"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "以最大化模式啓動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "重設偏好設定為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "設定語言"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "選項提供為 Java 系統屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "改變所有使用者設定值的資料夾"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4253,9 +4254,9 @@
 "      Java 選項以 MB 來指定分配到記憶體的最大容量"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "範例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4263,46 +4264,45 @@
 msgstr "參數 --download、 --downloadgps  和 --selection 會以這個順序處理。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "如果您使用 --selection 請確定已載入某些資料。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:189
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "初始化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:195
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "正在更新外掛程式..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:200
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "正在安裝更新的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "載入較早的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "設定預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:213
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "建立主視窗中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "正在載入外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:246
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
 msgid "Restore"
-msgstr "解決"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:249
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
 #, java-format
 msgid ""
@@ -4311,5 +4311,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4405,33 +4405,33 @@
 msgstr "拉遠"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:44
 msgid "scale"
 msgstr "縮放"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The geographic longitude at the mouse pointer."
 msgstr "滑鼠指標所在的地理經度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The name of the object at the mouse pointer."
 msgstr "滑鼠指標所在的物件名稱。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic latitude at the mouse pointer."
 msgstr "滑鼠指標所在的地理緯度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The angle between the previous and the current way segment."
 msgstr "前一個路徑區段與目前區段之間的角度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "繪出線段的（指南針）箭頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The length of the new way segment being drawn."
 msgstr "繪出新的路徑區段的長度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:200
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4439,9 +4439,9 @@
 msgstr "按滑鼠中鍵可以進行循環。<br>按住 CTRL 可以用滑鼠直接從清單中選擇。<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:296
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:295
 msgid "(no object)"
 msgstr "(沒有物件)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:432
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:431
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4457,4 +4457,19 @@
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "圖層「{0}」必須在圖層的清單中"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
+#, fuzzy
+msgid "Metric"
+msgstr "數字"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
+#, fuzzy
+msgid "Chinese"
+msgstr "中文"
+
+#: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
+#, fuzzy
+msgid "Imperial"
+msgstr "紀念碑"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5166,5 +5181,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "all"
 msgstr "全部"
@@ -5246,6 +5261,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:461
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:421
 #, java-format
 msgid "{0} way"
@@ -5255,5 +5270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:426
 #, java-format
 msgid "{0} relation"
@@ -5392,5 +5407,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
 msgid "Changesets"
 msgstr "變更組合"
@@ -5451,5 +5466,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
@@ -5612,5 +5627,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
 msgctxt "filter"
 msgid "E"
@@ -5618,5 +5633,5 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:260
 msgctxt "filter"
 msgid "H"
@@ -5624,5 +5639,5 @@
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:261
 msgctxt "filter"
 msgid "Text"
@@ -5630,5 +5645,5 @@
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:262
 msgctxt "filter"
 msgid "I"
@@ -5636,5 +5651,5 @@
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:263
 msgctxt "filter"
 msgid "M"
@@ -5643,5 +5658,5 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
 msgctxt "filter"
 msgid "R"
@@ -5649,5 +5664,5 @@
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
 msgctxt "filter"
 msgid "A"
@@ -5655,5 +5670,5 @@
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:336
 msgctxt "filter"
 msgid "D"
@@ -5661,24 +5676,24 @@
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:338
 msgctxt "filter"
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:368
 msgid "<h2>Filter active</h2>"
 msgstr "<h2>過濾條件已使用</h2>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:374
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
 msgstr "<p><b>{0}</b> 物件已隱藏"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:382
 #, java-format
 msgid "<b>{0}</b> objects disabled"
 msgstr "<b>{0}</b> 物件已停用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:385
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr "</p><p>關閉過濾條件對話盒以查看所有的物件。<p></html>"
@@ -5758,51 +5773,51 @@
 msgstr "關閉此對話盒，不要建立新的節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:158
 msgid "Layers"
 msgstr "圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:157
 msgid "Open a list of all loaded layers."
 msgstr "開啟所有載入圖層的清單。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:277
 msgid "Delete the selected layers."
 msgstr "刪除選取的圖層。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:368
+msgid "Toggle visible state of the selected layer."
+msgstr "切換選取的圖層可見性狀態。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:370
 msgid "Show/Hide"
 msgstr "顯示/隱藏"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
-msgid "Toggle visible state of the selected layer."
-msgstr "切換選取的圖層可見性狀態。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:424
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507
 msgid "Activate"
 msgstr "使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:430
 msgid "Activate the selected layer"
 msgstr "使用選取的圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:494
 msgid "Merge this layer into another layer"
 msgstr "將這個圖層合併至另一個圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
 msgid "Duplicate this layer"
 msgstr "重製這個圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:643
 msgid "Move the selected layer one row up."
 msgstr "將選取的圖層上移一列。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:662
 msgid "Move the selected layer one row down."
 msgstr "將選取的圖層下移一列。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:38
 msgid "Information about layer"
 msgstr "關於圖層的資訊"
@@ -5812,5 +5827,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3212
 msgid "Relations"
 msgstr "關係"
@@ -6963,6 +6978,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7010,107 +7026,107 @@
 #: build/trans_presets.java:1619 build/trans_presets.java:1624
 #: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1652
-#: build/trans_presets.java:1660 build/trans_presets.java:1667
-#: build/trans_presets.java:1673 build/trans_presets.java:1680
-#: build/trans_presets.java:1687 build/trans_presets.java:1695
-#: build/trans_presets.java:1702 build/trans_presets.java:1710
-#: build/trans_presets.java:1717 build/trans_presets.java:1723
-#: build/trans_presets.java:1730 build/trans_presets.java:1737
-#: build/trans_presets.java:1744 build/trans_presets.java:1761
-#: build/trans_presets.java:1769 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:1806
-#: build/trans_presets.java:1813 build/trans_presets.java:1819
-#: build/trans_presets.java:1829 build/trans_presets.java:1834
-#: build/trans_presets.java:1842 build/trans_presets.java:1849
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1872
-#: build/trans_presets.java:1877 build/trans_presets.java:1882
-#: build/trans_presets.java:1889 build/trans_presets.java:1895
-#: build/trans_presets.java:1900 build/trans_presets.java:1909
-#: build/trans_presets.java:1918 build/trans_presets.java:1927
-#: build/trans_presets.java:1936 build/trans_presets.java:1945
-#: build/trans_presets.java:1951 build/trans_presets.java:1959
-#: build/trans_presets.java:1965 build/trans_presets.java:1971
-#: build/trans_presets.java:1977 build/trans_presets.java:1983
-#: build/trans_presets.java:1989 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2013 build/trans_presets.java:2019
-#: build/trans_presets.java:2025 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2067 build/trans_presets.java:2073
-#: build/trans_presets.java:2079 build/trans_presets.java:2085
-#: build/trans_presets.java:2091 build/trans_presets.java:2097
-#: build/trans_presets.java:2103 build/trans_presets.java:2109
-#: build/trans_presets.java:2115 build/trans_presets.java:2121
-#: build/trans_presets.java:2127 build/trans_presets.java:2133
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2169
-#: build/trans_presets.java:2175 build/trans_presets.java:2181
-#: build/trans_presets.java:2195 build/trans_presets.java:2201
-#: build/trans_presets.java:2207 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2229
-#: build/trans_presets.java:2236 build/trans_presets.java:2242
-#: build/trans_presets.java:2249 build/trans_presets.java:2255
-#: build/trans_presets.java:2261 build/trans_presets.java:2267
-#: build/trans_presets.java:2275 build/trans_presets.java:2282
-#: build/trans_presets.java:2289 build/trans_presets.java:2296
-#: build/trans_presets.java:2304 build/trans_presets.java:2336
-#: build/trans_presets.java:2341 build/trans_presets.java:2351
-#: build/trans_presets.java:2356 build/trans_presets.java:2362
-#: build/trans_presets.java:2368 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2420 build/trans_presets.java:2427
-#: build/trans_presets.java:2528 build/trans_presets.java:2535
-#: build/trans_presets.java:2556 build/trans_presets.java:2564
-#: build/trans_presets.java:2569 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2589
-#: build/trans_presets.java:2595 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2622 build/trans_presets.java:2628
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2653
-#: build/trans_presets.java:2659 build/trans_presets.java:2665
-#: build/trans_presets.java:2672 build/trans_presets.java:2679
-#: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2704
-#: build/trans_presets.java:2710 build/trans_presets.java:2716
-#: build/trans_presets.java:2723 build/trans_presets.java:2730
-#: build/trans_presets.java:2737 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2774
-#: build/trans_presets.java:2783 build/trans_presets.java:2798
-#: build/trans_presets.java:2804 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2839
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2874 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
-#: build/trans_presets.java:2901 build/trans_presets.java:2907
-#: build/trans_presets.java:2915 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2977
-#: build/trans_presets.java:2983 build/trans_presets.java:2989
-#: build/trans_presets.java:2998 build/trans_presets.java:3008
-#: build/trans_presets.java:3017 build/trans_presets.java:3023
-#: build/trans_presets.java:3029 build/trans_presets.java:3034
-#: build/trans_presets.java:3040 build/trans_presets.java:3046
-#: build/trans_presets.java:3055 build/trans_presets.java:3061
-#: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3104 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3123
-#: build/trans_presets.java:3129 build/trans_presets.java:3138
-#: build/trans_presets.java:3146 build/trans_presets.java:3152
-#: build/trans_presets.java:3158 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3190
-#: build/trans_presets.java:3196 build/trans_presets.java:3202
-#: build/trans_presets.java:3214 build/trans_presets.java:3228
-#: build/trans_presets.java:3247 build/trans_presets.java:3261
+#: build/trans_presets.java:1644 build/trans_presets.java:1653
+#: build/trans_presets.java:1661 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1689 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1719 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1746 build/trans_presets.java:1763
+#: build/trans_presets.java:1771 build/trans_presets.java:1790
+#: build/trans_presets.java:1800 build/trans_presets.java:1812
+#: build/trans_presets.java:1819 build/trans_presets.java:1825
+#: build/trans_presets.java:1835 build/trans_presets.java:1840
+#: build/trans_presets.java:1848 build/trans_presets.java:1855
+#: build/trans_presets.java:1861 build/trans_presets.java:1867
+#: build/trans_presets.java:1873 build/trans_presets.java:1878
+#: build/trans_presets.java:1883 build/trans_presets.java:1888
+#: build/trans_presets.java:1895 build/trans_presets.java:1901
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
+#: build/trans_presets.java:1942 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
+#: build/trans_presets.java:2019 build/trans_presets.java:2025
+#: build/trans_presets.java:2031 build/trans_presets.java:2037
+#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2056 build/trans_presets.java:2065
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:2145 build/trans_presets.java:2151
+#: build/trans_presets.java:2157 build/trans_presets.java:2163
+#: build/trans_presets.java:2169 build/trans_presets.java:2175
+#: build/trans_presets.java:2181 build/trans_presets.java:2187
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2220
+#: build/trans_presets.java:2227 build/trans_presets.java:2235
+#: build/trans_presets.java:2242 build/trans_presets.java:2248
+#: build/trans_presets.java:2255 build/trans_presets.java:2261
+#: build/trans_presets.java:2267 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2288
+#: build/trans_presets.java:2295 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2342
+#: build/trans_presets.java:2347 build/trans_presets.java:2357
+#: build/trans_presets.java:2362 build/trans_presets.java:2368
+#: build/trans_presets.java:2374 build/trans_presets.java:2391
+#: build/trans_presets.java:2397 build/trans_presets.java:2403
+#: build/trans_presets.java:2409 build/trans_presets.java:2415
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2534 build/trans_presets.java:2541
+#: build/trans_presets.java:2562 build/trans_presets.java:2570
+#: build/trans_presets.java:2575 build/trans_presets.java:2581
+#: build/trans_presets.java:2588 build/trans_presets.java:2595
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2641 build/trans_presets.java:2647
+#: build/trans_presets.java:2653 build/trans_presets.java:2659
+#: build/trans_presets.java:2665 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2685
+#: build/trans_presets.java:2692 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2710
+#: build/trans_presets.java:2716 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2736
+#: build/trans_presets.java:2743 build/trans_presets.java:2749
+#: build/trans_presets.java:2755 build/trans_presets.java:2780
+#: build/trans_presets.java:2789 build/trans_presets.java:2804
+#: build/trans_presets.java:2810 build/trans_presets.java:2818
+#: build/trans_presets.java:2825 build/trans_presets.java:2845
+#: build/trans_presets.java:2856 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2921 build/trans_presets.java:2928
+#: build/trans_presets.java:2935 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2955
+#: build/trans_presets.java:2962 build/trans_presets.java:2971
+#: build/trans_presets.java:2977 build/trans_presets.java:2983
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3004 build/trans_presets.java:3014
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3035 build/trans_presets.java:3040
+#: build/trans_presets.java:3046 build/trans_presets.java:3052
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3079
+#: build/trans_presets.java:3085 build/trans_presets.java:3091
+#: build/trans_presets.java:3097 build/trans_presets.java:3104
+#: build/trans_presets.java:3110 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3144
+#: build/trans_presets.java:3152 build/trans_presets.java:3158
+#: build/trans_presets.java:3164 build/trans_presets.java:3171
+#: build/trans_presets.java:3177 build/trans_presets.java:3184
+#: build/trans_presets.java:3190 build/trans_presets.java:3196
+#: build/trans_presets.java:3202 build/trans_presets.java:3208
+#: build/trans_presets.java:3220 build/trans_presets.java:3234
+#: build/trans_presets.java:3253 build/trans_presets.java:3267
 msgid "Name"
 msgstr "名稱"
@@ -7465,5 +7481,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:136
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
@@ -7551,5 +7567,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 msgid "<different>"
 msgstr "<不同>"
@@ -8288,5 +8304,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 msgid "Bounds"
 msgstr "邊界"
@@ -8359,8 +8375,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2376 build/trans_presets.java:2410
-#: build/trans_presets.java:2419 build/trans_presets.java:2445
-#: build/trans_presets.java:2999 build/trans_presets.java:3009
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:2382 build/trans_presets.java:2416
+#: build/trans_presets.java:2425 build/trans_presets.java:2451
+#: build/trans_presets.java:3005 build/trans_presets.java:3015
+#: build/trans_presets.java:3024
 msgid "Type"
 msgstr "類型"
@@ -8389,6 +8405,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:1375 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
 msgid "unknown"
 msgstr "不明"
@@ -8726,5 +8742,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:359
 msgid "Conflicts detected"
 msgstr "選取的衝突"
@@ -8791,14 +8807,15 @@
 msgstr "警告：錯誤標頭「{0}」與預期的模式不符"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "提供關於您所上傳變更的簡短註解："
 
-#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "請輸入上傳備註（最小 3 個字元）"
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
+#, fuzzy
+msgid "Enter an upload comment"
+msgstr "不合格的上傳註解"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:49
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:50
 msgid "Changeset id:"
 msgstr "變更組合 id："
@@ -9237,5 +9254,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492
 msgid "Upload"
 msgstr "上傳"
@@ -9257,5 +9274,5 @@
 msgstr "正在初始化要更新的關係 ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 #: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
@@ -9263,60 +9280,94 @@
 msgstr "設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "決定如何上傳資料以及要使用哪個變更組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
 msgid "Tags of new changeset"
 msgstr "新變更組合的標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "將標籤套用到上傳的變更組合資料"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Manage open changesets and select a changeset to upload to"
 msgstr "管理開放的變更組合並選擇要上傳的變更組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:137
 msgid "Configure advanced settings"
 msgstr "設定進階設定值"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:178
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
 #, java-format
 msgid "Upload to ''{0}''"
 msgstr "上傳到「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:359
 msgid "Upload Changes"
 msgstr "上傳變更"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:361
 msgid "Upload the changed primitives"
 msgstr "上傳已變更的原型"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "請輸入這個上傳變更組合的註解 (最少 3 個字元)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
-msgid "Illegal upload comment"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
+#, fuzzy
+msgid "Please revise upload comment"
 msgstr "不合格的上傳註解"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Revise"
+msgstr "反轉"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
+#, fuzzy
+msgid "Continue as is"
+msgstr "繼續"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid ""
+"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
+"is technically allowed, but please consider that many users who are<br /"
+">watching changes in their area depend on meaningful changeset comments<br /"
+">to understand what is going on!<br /><br />If you spend a minute now to "
+"explain your change, you will make life<br />easier for many other mappers."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
+msgid "Return to the previous dialog to enter a more descriptive comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
+#, fuzzy
+msgid "Cancel and return to the previous dialog"
+msgstr "取消並回到編輯器"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
+msgid "Ignore this hint and upload anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "不要再次顯示這個訊息"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
 msgstr "請先輸入有效的區塊大小"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
 msgid "Illegal chunk size"
 msgstr "不合格的區塊大小"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:438
 msgid "Cancel the upload and resume editing"
 msgstr "取消上傳並繼續編輯"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
 #, java-format
 msgid "Tags of changeset {0}"
@@ -9650,107 +9701,11 @@
 msgstr[0] "{0} 個物件要刪除："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:283
 msgid "gps point"
 msgstr "gps 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
-msgid "Customize line drawing"
-msgstr "自訂線條的繪製"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Use global settings."
-msgstr "使用全域設定值。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
-msgid "Draw lines between points for this layer."
-msgstr "在這個圖層的各點之間繪出線條。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
-msgid "Do not draw lines between points for this layer."
-msgstr "在這個圖層的各點之間不要繪出線條。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
-msgid "Select line drawing options"
-msgstr "選擇線條繪製選項"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-msgid "Customize Color"
-msgstr "自訂顏色"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "預設值"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "選擇一種顏色"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:199
-msgid "Markers From Named Points"
-msgstr "已命名點的標記"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:214
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "{0} 的已命名軌跡點"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
-msgid "Import Audio"
-msgstr "匯入音效"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
-msgstr ""
-"<html>GPX 圖層「{0}」中的資料已從伺服器下載。<br>因為它的航點並不包含時間戳"
-"記，我們不能將它們與聲音資料關聯。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
-msgid "Import not possible"
-msgstr "不可能匯入"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:255
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave 音效檔案 (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "{0} 的音效標記"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
-msgid "Import images"
-msgstr "匯入圖片"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:309
-#, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
-msgstr ""
-"<html>GPX 圖層「{0}」中的資料已從伺服器下載。<br>因為它的航點並不包含時間戳"
-"記，我們不能將它們與照片關聯。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9758,5 +9713,5 @@
 msgstr "名稱：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
 #, java-format
@@ -9764,5 +9719,5 @@
 msgstr "描述：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
 #, java-format
 msgid "{0} track"
@@ -9771,23 +9726,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3270
 msgid "Description"
 msgstr "描述"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 msgid "Timespan"
 msgstr "時間跨度"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 msgid "Length"
 msgstr "長度"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:454
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:239
 msgid "Length: "
 msgstr "長度： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:457
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:242
 #, java-format
 msgid "{0} route, "
@@ -9795,5 +9750,5 @@
 msgstr[0] "{0} 路線， "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:458
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:243
 #, java-format
 msgid "{0} waypoint"
@@ -9801,10 +9756,10 @@
 msgstr[0] "{0} 航點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:602
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "轉換為資料圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:610
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9814,21 +9769,21 @@
 "軌跡，請看這裡："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:635
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:537
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:148
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:161
 #, java-format
 msgid "Converted from: {0}"
 msgstr "轉換自：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:910
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:657
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:103
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:220
@@ -9836,10 +9791,10 @@
 msgstr "從 OSM 沿這條軌跡下載"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:880
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:665
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:82
 msgid "Download everything within:"
 msgstr "下載這裡面的每個物件："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:883
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:85
 #, java-format
@@ -9847,10 +9802,10 @@
 msgstr "{0} 公尺"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:889
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:674
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:92
 msgid "Maximum area per request:"
 msgstr "每個要求最大區域："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:892
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:677
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:95
 #, java-format
@@ -9858,21 +9813,21 @@
 msgstr "{0} 平方公里"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:898
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
 msgstr "下載接近："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
 msgstr "只有軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
 msgstr "只有航點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:899
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
 msgstr "軌跡與航點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1025
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:214
 #, java-format
@@ -9883,9 +9838,9 @@
 "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:919
 msgid "No GPX track available in layer to associate audio with."
 msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1294
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1079
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9893,5 +9848,5 @@
 msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1086
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9899,23 +9854,119 @@
 msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1208
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+msgid "Customize line drawing"
+msgstr "自訂線條的繪製"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1214
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+msgid "Use global settings."
+msgstr "使用全域設定值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+msgid "Draw lines between points for this layer."
+msgstr "在這個圖層的各點之間繪出線條。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1216
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+msgid "Do not draw lines between points for this layer."
+msgstr "在這個圖層的各點之間不要繪出線條。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1230
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:260
+msgid "Select line drawing options"
+msgstr "選擇線條繪製選項"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:407
+msgid "Customize Color"
+msgstr "自訂顏色"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1257
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:414
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "預設值"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:418
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "選擇一種顏色"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
+msgid "Markers From Named Points"
+msgstr "已命名點的標記"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1301
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} 的已命名軌跡點"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1313
+msgid "Import Audio"
+msgstr "匯入音效"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1318
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>GPX 圖層「{0}」中的資料已從伺服器下載。<br>因為它的航點並不包含時間戳"
+"記，我們不能將它們與聲音資料關聯。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1414
+msgid "Import not possible"
+msgstr "不可能匯入"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1349
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave 音效檔案 (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1383
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} 的音效標記"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1402
+msgid "Import images"
+msgstr "匯入圖片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1407
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html>GPX 圖層「{0}」中的資料已從伺服器下載。<br>因為它的航點並不包含時間戳"
+"記，我們不能將它們與照片關聯。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
 #, java-format
 msgid "Data Layer {0}"
 msgstr "資料圖層 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "outside downloaded area"
 msgstr "超出下載的區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
 #, java-format
 msgid "version {0}"
 msgstr "版本 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9923,11 +9974,11 @@
 msgstr[0] "偵測到 {0} 個衝突。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
 msgstr "按這裡關閉這個對話盒並繼續編輯"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} deleted"
@@ -9935,36 +9986,36 @@
 msgstr[0] "{0} 已刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:431
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} 組成："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 msgid "unset"
 msgstr "取消設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:435
 #, java-format
 msgid "API version: {0}"
 msgstr "API 版本： {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:534
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:145
 msgid "Convert to GPX layer"
 msgstr "轉換為 GPX 圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
 msgstr "資料組合一致性測試"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
 msgid "No problems found"
 msgstr "沒有發現問題"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
 msgstr "發現下列問題："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9974,5 +10025,5 @@
 "請看這裡：</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
 msgctxt "gps"
 msgid "track"
@@ -9980,10 +10031,10 @@
 msgstr[0] "軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
 msgstr[0] "點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -9991,5 +10042,5 @@
 msgstr[0] "有 {0} 個點的軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -9997,5 +10048,5 @@
 msgstr[0] "{0} 由 {1} 軌跡組成"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -10003,24 +10054,28 @@
 msgstr[0] "{0} 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:95
+msgid "Correlate to GPX"
+msgstr "關聯到 GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:148
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX 檔案 (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "檔案 {0} 已經以「{1}」的名稱載入了。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:193
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "當解析 {0} 時發生錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:202
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "不能讀取 \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10031,34 +10086,34 @@
 "據您讀取到的相片時刻並選擇時區<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:260
 msgid "Photo time (from exif):"
 msgstr "相片時刻 (取自 exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:275
 msgid "Gps time (read from the above photo): "
 msgstr "Gps 時刻（自上列相片讀取）： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:287
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:295
 msgid "I am in the timezone of: "
 msgstr "我所在的時區： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:359
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:394
 msgid "No date"
 msgstr "沒有日期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:368
 msgid "Open another photo"
 msgstr "開啟其他相片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:408
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "從 GPS 接收器的相片同步時間"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
 msgid ""
 "Error while parsing the date.\n"
@@ -10068,93 +10123,93 @@
 "請使用要求的格式"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:423
 msgid "Invalid date"
 msgstr "無效的日期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:467
 msgid "<No GPX track loaded yet>"
 msgstr "<尚未載入 GPX 軌跡>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:472
 msgid "GPX track: "
 msgstr "GPX 軌跡： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:481
 msgid "Open another GPX trace"
 msgstr "開啟另一個 GPX 軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:511
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr "<html>使用精準時鐘的照片，<br>例如 GPS 接收器顯示</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
 msgid "Auto-Guess"
 msgstr "自動猜測"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:515
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
 msgstr "將第一張照片與第一個 gpx 點配對"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
 msgid "Manual adjust"
 msgstr "手動調整"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:521
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
 msgstr "覆蓋此地點： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr "在 exif 資料中有地理位置的照片 ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:530
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:532
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "已加上標籤的照片 ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
 msgid "Show Thumbnail images on the map"
 msgstr "在地圖上顯示圖片縮圖"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:561
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:563
 msgid "Timezone: "
 msgstr "時區： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:572
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:574
 msgid "Offset:"
 msgstr "位移："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
 msgid "Correlate images with GPX track"
 msgstr "將圖片與 GPX 軌跡關聯"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "Correlate"
 msgstr "關聯"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:676
 msgid "Invalid timezone"
 msgstr "無效的時區"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:682
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:684
 msgid "Invalid offset"
 msgstr "無效的移位"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:692
 msgid "Try Again"
 msgstr "再試一次"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:691
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
 msgstr "無法配對任何圖片！"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:815
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
 msgstr "尚未選擇 gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10163,20 +10218,20 @@
 msgstr[0] "<html>已比對 <b>{0}</b> / <b>{1}</b> 照片至 GPX 軌跡。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
 #, java-format
 msgid "Timezone: {0}"
 msgstr "時區：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:904
 #, java-format
 msgid "Minutes: {0}"
 msgstr "分鐘：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:905
 #, java-format
 msgid "Seconds: {0}"
 msgstr "秒鐘：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:923
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10184,5 +10239,5 @@
 msgstr[0] "({0} 天的時間差異)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:948
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10190,21 +10245,21 @@
 msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Matching photos to track failed"
 msgstr "比對相片至軌跡失敗"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:968
 msgid "Adjust timezone and offset"
 msgstr "調整時區並補償"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:988
 msgid "The selected photos do not contain time information."
 msgstr "選取的相片未包含時刻資訊。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:989
 msgid "Photos do not contain time information"
 msgstr "相片未包含時刻資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1017
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10212,17 +10267,17 @@
 msgstr "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1016
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1018
 msgid "GPX Track has no time information"
 msgstr "GPX 軌跡沒有時刻資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1113
 msgid "You should select a GPX track"
 msgstr "您應該選擇一個 GPX 軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1114
 msgid "No selected GPX track"
 msgstr "沒有選取的 GPX 軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1300
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1306
 #, java-format
 msgid ""
@@ -10233,5 +10288,5 @@
 "預期的格式：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1376
 #, java-format
 msgid ""
@@ -10242,56 +10297,52 @@
 "預期的格式：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:103
 msgid "Extracting GPS locations from EXIF"
 msgstr "從 EXIF 中解出 GPS 位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:111
 msgid "Starting directory scan"
 msgstr "開始掃描目錄"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:116
 msgid "One of the selected files was null"
 msgstr "選取的檔案中有一個是 null"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
 msgid "Read photos..."
 msgstr "讀取相片..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:136
 #, java-format
 msgid "Reading {0}..."
 msgstr "正在讀取 {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:175
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "無法取得目錄  {0} 的路徑\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:187
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "正在掃描目錄 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:192
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "在目錄 {0} 找到空的檔案\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "從目錄 {0} 取得檔案時發生錯誤\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:268
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "有 Geotag 的圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
-msgid "Correlate to GPX"
-msgstr "關聯到 GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:311
 #, java-format
 msgid "{0} image loaded."
@@ -10299,5 +10350,5 @@
 msgstr[0] "已載入 {0} 張圖片。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:312
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10305,10 +10356,10 @@
 msgstr[0] "發現 {0} 已有 GPS 標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:662
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "從磁碟刪除圖片檔"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:665
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:650
 #, java-format
 msgid ""
@@ -10318,5 +10369,5 @@
 "<html><h3>是否從磁碟刪除檔案 {0}？<p>這個照片檔案會永久消失！</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:690
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
 msgid "Image file could not be deleted."
 msgstr "無法刪除圖片檔案。"
@@ -10418,14 +10469,14 @@
 msgstr "JPEG 圖片 (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
 msgid "gps marker"
 msgstr "gps 標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
 msgstr[0] "標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10433,14 +10484,26 @@
 msgstr[0] "{0} 由 {1} 標記組成"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+msgid "No existing audio markers in this layer to offset from."
+msgstr "這個圖層中沒有既存的音效標記可位移。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:377
+msgid "Show Text/Icons"
+msgstr "顯示文字/圖示"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:378
+msgid "Toggle visible state of the marker text and icons."
+msgstr "切換標記文字和圖示的可見性狀態。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:442
 msgid "Synchronize Audio"
 msgstr "同步音效"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr "當您在聆聽同步隊列時需要暫停音效。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:461
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10448,30 +10511,18 @@
 msgstr "音效同步於點 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:468
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "在播放時無法於圖層同步。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:479
 msgid "Make Audio Marker at Play Head"
 msgstr "在播放開頭放置聲音標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:488
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
 "marker."
 msgstr "您需要在軌跡上想標記的點暫停音效。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
-msgid "No existing audio markers in this layer to offset from."
-msgstr "這個圖層中沒有既存的音效標記可位移。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-msgid "Show Text/Icons"
-msgstr "顯示文字/圖示"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
-msgid "Toggle visible state of the marker text and icons."
-msgstr "切換標記文字和圖示的可見性狀態。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
@@ -11356,4 +11407,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "None"
 msgstr "沒有"
@@ -11368,5 +11420,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:156
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "Draw a circle form HDOP value."
 msgstr "從 HDOP 數值繪製圓形。"
@@ -11469,5 +11521,5 @@
 #. only interesting directions
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "只有重要的方向提示（例如單行道標籤）。"
@@ -11475,5 +11527,5 @@
 #. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Only on the head of a way."
 msgstr "只在路徑的開頭。"
@@ -11503,5 +11555,19 @@
 msgstr "讀取 GPX 時建立標記。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Auto"
+msgstr "作者"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgid "Desc"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#, fuzzy
+msgid "Both"
+msgstr "小船"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11509,9 +11575,9 @@
 msgstr "開啟 GPX 圖層時自動從任何航點製作標記圖層。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
 msgid "Draw lines between raw GPS points"
 msgstr "在原始 GPS 點之間繪出線條"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11519,34 +11585,34 @@
 msgstr "繪出本地端檔案線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid "Maximum length for local files (meters)"
 msgstr "本地端檔案最大長度（公尺）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "繪出線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:120
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid "Maximum length (meters)"
 msgstr "最大長度（公尺）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "如果匯入的資料不含線條資訊，仍強制繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "繪出線條的方向箭頭，連接 GPS 點。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "使用表格查詢的方式繪製方向箭頭而非複雜的數學運算。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11554,13 +11620,13 @@
 msgstr "如果沒有距離最後一個至少這個距離就不要繪出箭頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（像素）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
 msgid "Draw larger dots for the GPS points."
 msgstr "將 GPS 點以較大的點繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11568,9 +11634,9 @@
 msgstr "所有的點和軌跡區段都使用同樣的顏色。可以在圖層管理程式自訂。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
 msgid "Colors points and track segments by velocity."
 msgstr "依速度來為點和軌跡區段上色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11578,46 +11644,55 @@
 msgstr "為地點精度 (HDOP) 的點和軌跡區段上色。您的捕捉裝置需要能記錄這項資訊。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:195
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "允許依不同的平均速度調整軌跡顏色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
 msgid "Track and Point Coloring"
 msgstr "軌跡與點的顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:209
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+msgid "Allows to change the labelling of track waypoints."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#, fuzzy
+msgid "Waypoint labelling"
+msgstr "航點描述"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
 msgid "GPS Points"
 msgstr "GPS 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
 msgid "Draw direction hints for way segments."
 msgstr "繪出路徑區段的方向提示。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
 msgid "Draw the order numbers of all segments within their way."
 msgstr "繪出所有區段在其路徑中的順序編號。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "在地圖檢視套用平滑化以產生較平滑的外觀。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:254
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "繪出從伺服器下載資料的邊界。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "為了容易修改路徑在選擇模式中繪出虛擬節點。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
 msgid "Draw the inactive data layers in a different color."
 msgstr "將未使用的資料圖層以不同的顏色繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:271
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
 msgid "OSM Data"
 msgstr "OSM 資料"
@@ -11974,21 +12049,26 @@
 msgstr "您必須重新啟動 JOSM 才能讓某些設定值生效。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:137
+msgid "Projection method"
+msgstr "投影方法"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:140
+msgid "Projection code"
+msgstr "投影法代碼"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:150
 msgid "Display coordinates as"
 msgstr "顯示坐標為"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
-msgid "Projection method"
-msgstr "投影方法"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
-msgid "Projection code"
-msgstr "投影法代碼"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
+#, fuzzy
+msgid "System of measurement"
+msgstr "要進行測量的圖層"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 msgid "Map Projection"
 msgstr "地圖投影"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:209
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12561,5 +12641,5 @@
 msgstr "加入新標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:362
 #, java-format
 msgid ""
@@ -12569,49 +12649,49 @@
 "損壞的預設組合 \"{0}-{1}\" - 在 display_values 中項目的數量必須和數值裡的相同"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:488
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
 msgstr "更多關於這個功能的資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:525
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "不明的必需品：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:582
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 msgid "Available roles"
 msgstr "可用的角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
 msgid "role"
 msgstr "角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:584
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
 msgid "count"
 msgstr "計次"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 msgid "elements"
 msgstr "元素"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:601
 msgid "Optional Attributes:"
 msgstr "額外屬性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:698
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:699
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明的類型：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:766
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:774
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:807
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12621,15 +12701,15 @@
 msgstr "無法讀取標籤預設組合來源：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:817
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:818
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "分析 {0} 時發生錯誤： "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:859
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "類型 {0} 的元件已支援。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:921
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:922
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12638,17 +12718,17 @@
 msgstr[0] "改變 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:924
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:925
 msgid "Nothing selected!"
 msgstr "尚未選擇！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:926
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:927
 msgid "Selection unsuitable!"
 msgstr "選擇區域不合適！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:934
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:935
 msgid "Apply Preset"
 msgstr "套用預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1010
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -12666,7 +12746,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
-#, fuzzy
 msgid "Search preset"
-msgstr "搜尋： "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
@@ -12675,17 +12754,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
-#, fuzzy
 msgid "Search presets"
-msgstr "搜尋物件"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
-#, fuzzy
 msgid "Show only applicable to selection"
-msgstr "在選擇清單中顯示本地化的名稱"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
-#, fuzzy
 msgid "Search in tags"
-msgstr "搜尋： "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12986,5 +13062,5 @@
 msgstr "分析檔案「{0}」失敗"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:338
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "分析錯誤：gpx 文件有無效的文件結構"
@@ -14487,5 +14563,5 @@
 "<br><br>錯誤的訊息為：<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:446
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14760,5 +14836,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Address Interpolation"
 msgstr ""
@@ -15160,41 +15236,41 @@
 msgstr "不要再次顯示這個訊息"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 msgid "Building address"
 msgstr "建築地址"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
 msgid "House number:"
 msgstr "門牌號碼："
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:45
 msgid "Street Name:"
 msgstr "街道名稱："
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
 msgid "Increment"
 msgstr "遞增"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:50
 msgid "Decrement"
 msgstr "遞減"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:52
 msgid "Numbers:"
 msgstr "號碼："
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
 msgstr ""
@@ -15211,25 +15287,25 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
 msgid "Set buildings size"
 msgstr "設定建築物大小"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:26
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
 msgid "Use Address dialog"
 msgstr "使用地址對話盒"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
 msgid "Buildings width:"
 msgstr "建築物寬度："
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
 msgstr ""
@@ -15267,18 +15343,18 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2193
 msgid "Buildings"
 msgstr "建築物"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:424
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:425
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr "街"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:466
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
 msgstr ""
@@ -15516,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:2376 build/trans_style.java:1018
+#: build/trans_presets.java:2382 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3525
-#: build/trans_style.java:3533
+#: build/trans_style.java:1058 build/trans_style.java:3533
+#: build/trans_style.java:3541
 msgid "water"
 msgstr "水域"
@@ -15578,6 +15654,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4377 build/trans_style.java:4384
-#: build/trans_style.java:4391 build/trans_style.java:4398
+#: build/trans_style.java:4385 build/trans_style.java:4392
+#: build/trans_style.java:4399 build/trans_style.java:4406
 msgid "address"
 msgstr "住址"
@@ -16058,34 +16134,34 @@
 "請先選擇它們中的一個，然後重試"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:93
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:79
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193
 msgid "Blank Layer"
 msgstr "空白圖層"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "WMS 圖層 ({0})，已載入 {1} 個拼貼"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 msgid "Is not vectorized."
 msgstr "並非向量化的。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
 #, java-format
 msgid "Raster size: {0}"
 msgstr "點陣大小：{0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 msgid "Is vectorized."
 msgstr "是向量化的。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -16096,14 +16172,14 @@
 "建立一個新的。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "快取格式錯誤"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "快取中的蘭勃特區 {0} 與目前的蘭勃特區 {1} 不相容"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 msgid "Cache Lambert Zone Error"
 msgstr "快取蘭勃特區發生錯誤"
@@ -16182,22 +16258,18 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
-#, fuzzy
 msgid "Download along..."
-msgstr "下載物件..."
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
-#, fuzzy
 msgid "Download OSM data along the selected ways."
-msgstr "下載地圖資料於選取的路徑結尾"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
-#, fuzzy
 msgid "Download Along"
-msgstr "立即下載"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
-#, fuzzy
 msgid "Please select 1 or more ways to download along"
-msgstr "請選擇至少一項要下載的工作"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16207,12 +16279,12 @@
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
-#, fuzzy, java-format
+#, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr "測試 {0}/{1}：正在開始 {2}"
+msgstr ""
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
-#, fuzzy, java-format
+#, java-format
 msgid "  adding {0} {1}"
-msgstr "分析 {0} 時發生錯誤：{1}"
+msgstr ""
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16243,9 +16315,9 @@
 msgstr "建立重複的路徑"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:87
 msgid "Layer for editing GPX tracks"
 msgstr "編輯 GPX 軌跡的圖層"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:160
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:158
 msgid "Convert to GPX layer with anonymised time"
 msgstr "轉換為沒有時刻的 GPX 圖層"
@@ -16255,5 +16327,5 @@
 msgstr "編輯Gpx"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:39
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:38
 msgid "edit gpx tracks"
 msgstr "編輯 gpx 軌跡"
@@ -16262,11 +16334,11 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:46
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:96
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
 msgid "Import path from GPX layer"
 msgstr "從 GPX 圖層匯入路徑"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:86
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
 msgid "Drop existing path"
 msgstr "放棄現有的路徑"
@@ -16276,5 +16348,5 @@
 #. no gps layer
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:114
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
 msgid "No GPX data layer found."
 msgstr "找不到 GPX 資料圖層。"
@@ -16284,13 +16356,13 @@
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
 msgstr ""
 
-#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
+#: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
 msgid "CmdLine:"
 msgstr ""
@@ -16531,5 +16603,5 @@
 msgstr "顯示無 geotag 的相片"
 
-#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:68
 msgid "Imported Images"
 msgstr "匯入的圖片"
@@ -16882,8 +16954,6 @@
 msgstr "開啟測量視窗。"
 
-#. Create popup menu
-#. Reset submenu
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:316
 msgid "Reset"
 msgstr "重新設定"
@@ -16914,5 +16984,5 @@
 msgstr "兩個已取選節點間的角度"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
 msgid "Layer to make measurements"
 msgstr "要進行測量的圖層"
@@ -17004,5 +17074,5 @@
 msgstr "OpenStreetBugs 下載迴圈"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:112
 msgid "Displays OpenStreetBugs issues"
 msgstr "顯示 OpenStreetBugs 議題"
@@ -17070,13 +17140,13 @@
 msgstr "佇列"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "offline"
 msgstr "離線"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 msgid "online"
 msgstr "上線"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:417
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:420
 #, java-format
 msgid "OpenStreetBugs ({0})"
@@ -17190,94 +17260,94 @@
 msgstr "Firefox 可執行檔"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:43
 msgid "Read error!"
 msgstr "讀取錯誤！"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
 msgid "Write error!"
 msgstr "寫入錯誤！"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:52
+msgid "Write coordinates to image header"
+msgstr "將坐標寫入圖片檔頭"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:69
 msgid "Write position information into the exif header of the following files:"
 msgstr "將地點資訊寫入下列檔案的 exif 檔頭："
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
 msgid "settings"
 msgstr "設定值"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
 msgid "keep backup files"
 msgstr "保留備份檔案"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:91
 msgid "change file modification time:"
 msgstr "改變檔案修改時刻："
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to gps time"
 msgstr "為 gps 時刻"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:94
 msgid "to previous value (unchanged mtime)"
 msgstr "回到前一個數值（未變更 mtime）"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:115
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:146
 msgid "Photo Geotagging Plugin"
 msgstr "相片地理標籤外掛程式"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:153
 msgid "Writing position information to image files..."
 msgstr "將地點資訊寫入圖片檔案..."
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:177
 msgid "Could not read mtime."
 msgstr "無法讀取 mtime。"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:190
 msgid "Could not write mtime."
 msgstr "無法寫入 mtime。"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:230
 msgid "File could not be deleted!"
 msgstr "無法刪除檔案！"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:237
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:251
 msgid "Could not rename file!"
 msgstr "檔案無法重新命名！"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:260
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr "<html><h3>在圖片目錄中有舊的備份檔案！</h3>"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:264
 msgid "Override old backup files?"
 msgstr "是否覆蓋舊的備份檔案？"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Keep old backups and continue"
 msgstr "保留舊的備份並繼續"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:265
 msgid "Override"
 msgstr "覆蓋"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:286
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:302
 msgid "Could not delete temporary file!"
 msgstr "無法刪除暫存檔案！"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:298
 msgid "Test failed: Could not read mtime."
 msgstr "測試失敗：無法讀取 mtime。"
 
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:300
 msgid "Test failed: Could not write mtime."
 msgstr "測試失敗：無法寫入 mtime。"
-
-#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
-msgid "Write coordinates to image header"
-msgstr "將坐標寫入圖片檔頭"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
@@ -17318,9 +17388,9 @@
 msgstr "來自檔案的新相片圖層..."
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:108
 msgid "Image not created properly."
 msgstr "圖片無法正確的建立。"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:122
 msgid "Could not find the map object."
 msgstr "找不到地圖物件。"
@@ -17498,20 +17568,25 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#, fuzzy
+msgid "read protocol version"
+msgstr "合併的版本"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
 msgid "confirm all Remote Control actions manually"
 msgstr "手動確認所有的遠端控制動作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "允許 JOSM 被其他應用程式控制的外掛程式。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Remote Control"
 msgstr "遠端控制"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
 msgid "Settings for the Remote Control plugin."
 msgstr "遠端控制外掛程式的設定值。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -17522,50 +17597,58 @@
 "照了外部應用程式與此外掛程式的溝通。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:43
 msgid "Permitted actions"
 msgstr "准許的動作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:134
 msgid "Remote Control has been asked to load data from the API."
 msgstr "遠端控制被要求自 API 下載資料。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
 #, java-format
 msgid "Request details: {0}"
 msgstr "要求的詳細資料：{0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:253
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:135
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:250
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:263
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:299
 msgid "Do you want to allow this?"
 msgstr "您是否要允許這個？"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:254
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:136
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:264
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:300
 msgid "Confirm Remote Control action"
 msgstr "確認遠端控制動作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:239
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
 msgid "Remote Control has been asked to create a new node."
 msgstr "遠端控制被要求建立新的節點。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:251
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:261
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "遠端控制被要求自下列 URL 匯入資料："
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:298
+msgid ""
+"Remote Control has been asked to report its protocol version. This enables "
+"web sites to detect a running JOSM."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
 msgid "Revert changeset fully"
 msgstr "還原整個變更組合"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:26
 msgid "Revert selection only"
 msgstr "只還原選擇區域"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:27
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:28
 msgid "Revert selection and restore deleted objects"
 msgstr "還原選擇區域並復原已刪除的物件"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:26
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
@@ -17573,5 +17656,5 @@
 msgstr "還原變更組合"
 
-#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:45
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:46
 msgid "Revert"
 msgstr "還原"
@@ -17772,41 +17855,41 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
 msgid "Slippy Map"
 msgstr "快速地圖"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:149
 msgid "Auto Zoom"
 msgstr "自動縮放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:158
 msgid "Load Tile"
 msgstr "載入拼貼"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:168
 msgid "Show Tile Info"
 msgstr "顯示拼貼資訊"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:190
 msgid "Load All Tiles"
 msgstr "載入所有拼貼"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:199
 msgid "Increase zoom"
 msgstr "增加縮放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:207
 msgid "Decrease zoom"
 msgstr "減少縮放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:217
 msgid "Snap to tile size"
 msgstr "貼緊拼貼大小"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:233
 msgid "Flush Tile Cache"
 msgstr "清除拼貼快取"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:672
 msgid "image "
 msgstr "圖片 "
@@ -18105,4 +18188,14 @@
 msgid "Terrace"
 msgstr "連棟建築"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+msgid "SeaMap Symbol Entry"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#, fuzzy
+msgid "Seamark Editor"
+msgstr "分隔線"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18810,6 +18903,6 @@
 msgstr "加入缺少的標籤 {0}={1}"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:53
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:62
 #, java-format
 msgid ""
@@ -18819,9 +18912,9 @@
 msgstr ""
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Split now"
 msgstr "立即切割"
 
-#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:77
 msgid "Splits the way"
 msgstr "切割這個路徑"
@@ -18904,6 +18997,6 @@
 msgstr "找到 {0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:40
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:86
@@ -18911,5 +19004,5 @@
 msgstr "驗證的錯誤"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:95
 msgid "No validation errors"
 msgstr "沒有驗證上的錯誤"
@@ -19148,32 +19241,26 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
-#, fuzzy
 msgid "Mixed type duplicated nodes"
-msgstr "是否合併重複的節點？"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
-#, fuzzy
 msgid "Highway duplicated nodes"
-msgstr "重複的節點"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
-#, fuzzy
 msgid "Railway duplicated nodes"
-msgstr "重複的節點"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
-#, fuzzy
 msgid "Waterway duplicated nodes"
-msgstr "是否合併重複的節點？"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
-#, fuzzy
 msgid "Boundary duplicated nodes"
-msgstr "重複的節點"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
-#, fuzzy
 msgid "Power duplicated nodes"
-msgstr "是否合併重複的節點？"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19210,5 +19297,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3213
 msgid "Multipolygon"
 msgstr "多重多邊形"
@@ -19731,5 +19818,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4356
+#: build/trans_style.java:4364
 msgid "area"
 msgstr "區域"
@@ -19865,10 +19952,10 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:69
 #, 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:88
 msgid "Shows current position in the video"
 msgstr "顯示目前在影片中的位置"
@@ -20014,10 +20101,10 @@
 msgstr "無法從 walking-papers.org 讀取 id「{0}」的資訊"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:59
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers：{0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:362
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -20210,28 +20297,24 @@
 "這可能會導致錯誤的坐標。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:63
-msgid "Automatic downloading"
-msgstr "自動下載"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:107
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr "警告：不使用 WMS 圖層，因為基礎 url「{0}」格式錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
 msgid "(deactivated)"
 msgstr "(不使用)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS 圖層 ({0})，於縮放 {1} 自動下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS 圖層 ({0})，於縮放 {1} 下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:213
 #, java-format
 msgid ""
@@ -20245,65 +20328,69 @@
 "WMS 拼貼？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
 msgid "Yes, fetch images"
 msgstr "是，抓取圖片"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227
 msgid "Invalid URL?"
 msgstr "無效的 URL？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
 msgid "Download visible tiles"
 msgstr "下載可見的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "要求的區域太大。請拉近一點，或是改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "Change resolution"
 msgstr "改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:342
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:343
 msgid "Reload erroneous tiles"
 msgstr "重新載入錯誤的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:366
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:367
 msgid "Alpha channel"
 msgstr "透明色版"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:386
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:395
 msgid "Save WMS layer to file"
 msgstr "將 WMS 圖層儲存為檔案"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:390
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:399
 msgid "Save WMS layer"
 msgstr "儲存 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 msgid "Load WMS layer from file"
 msgstr "從檔案載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:427
 msgid "Load WMS layer"
 msgstr "載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:429
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:430
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
 msgid "File Format Error"
 msgstr "檔案格式錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:450
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:459
 msgid "Error loading file"
 msgstr "載入檔案有錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:464
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:473
 msgid "Set WMS Bookmark"
 msgstr "設定 WMS 書籤"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:499
+msgid "Automatic downloading"
+msgstr "自動下載"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:180
@@ -20382,5 +20469,5 @@
 #. which are not part of the programm texts, but should be translated nevertheless.
 #.
-#. The tex before is for translators
+#. The text before is for translators
 #.
 #. OSM server message
@@ -20415,5 +20502,5 @@
 msgstr "音效裝置無法使用"
 
-#. use has not made edits public
+#. OSM server message
 #: build/specialmessages.java:13
 msgid "You must make your edits public to upload new data"
@@ -20434,5 +20521,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3261
+#: build/specialmessages.java:15 build/trans_style.java:3269
 msgid "forest"
 msgstr "森林"
@@ -20445,78 +20532,67 @@
 #. relation type
 #: build/specialmessages.java:17
-#, fuzzy
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr "建立 associatedStreet 關係"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:18
-#, fuzzy
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "邊界"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:19
-#, fuzzy
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr "遞增"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:20
-#, fuzzy
 msgctxt "Relation type"
 msgid "line"
-msgstr "上線"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:21
-#, fuzzy
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr "多重多邊形"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:22
-#, fuzzy
 msgctxt "Relation type"
 msgid "network"
-msgstr "網路"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:23
-#, fuzzy
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr "大眾運輸"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:24
-#, fuzzy
 msgctxt "Relation type"
 msgid "restriction"
-msgstr "Turnrestriction"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:25
-#, fuzzy
 msgctxt "Relation type"
 msgid "route"
-msgstr "路線"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:26
-#, fuzzy
 msgctxt "Relation type"
 msgid "site"
-msgstr "貼上"
+msgstr ""
 
 #. relation type
 #: build/specialmessages.java:27
-#, fuzzy
 msgctxt "Relation type"
 msgid "waterway"
-msgstr "航道"
+msgstr ""
 
 #. Strings in JFileChooser
@@ -20795,7 +20871,6 @@
 #. Plugin download_along
 #: build/trans_plugins.java:20
-#, fuzzy
 msgid "Downloads OSM data along a way"
-msgstr "從 OSM 沿這條軌跡下載"
+msgstr ""
 
 #. Plugin Duplicate-Way
@@ -21004,6 +21079,11 @@
 msgstr "讓連棟房屋能超出單一區塊。"
 
+#. Plugin toms
+#: build/trans_plugins.java:88
+msgid "Create and edit seamarks for OpenSeaMap"
+msgstr ""
+
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:88
+#: build/trans_plugins.java:90
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21012,5 +21092,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:90
+#: build/trans_plugins.java:92
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21019,5 +21099,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:92
+#: build/trans_plugins.java:94
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21028,10 +21108,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:94
+#: build/trans_plugins.java:96
 msgid "Allows undeleting object from OSM database"
 msgstr "允許從 OSM 資料庫中取消物件的刪除"
 
 #. Plugin validator
-#: build/trans_plugins.java:96
+#: build/trans_plugins.java:98
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21042,5 +21122,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:98
+#: build/trans_plugins.java:100
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21052,5 +21132,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:100
+#: build/trans_plugins.java:102
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21061,15 +21141,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:102
+#: build/trans_plugins.java:104
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下載一整組互相聯結的路徑"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:104
+#: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:106
+#: build/trans_plugins.java:108
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21078,5 +21158,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:108
+#: build/trans_plugins.java:110
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21209,5 +21289,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2429 build/trans_presets.java:3262
+#: build/trans_presets.java:2435 build/trans_presets.java:3268
 msgid "Reference"
 msgstr "道路編號"
@@ -21746,5 +21826,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "metal"
 msgstr "金屬"
@@ -21757,5 +21837,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2511
+#: build/trans_presets.java:1254 build/trans_presets.java:2517
 msgid "wood"
 msgstr "木頭"
@@ -22059,9 +22139,9 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
-#: build/trans_presets.java:2469 build/trans_presets.java:2510
-#: build/trans_presets.java:2519 build/trans_presets.java:2520
-#: build/trans_presets.java:2521 build/trans_presets.java:2811
+#: build/trans_presets.java:1496 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:2475 build/trans_presets.java:2516
+#: build/trans_presets.java:2525 build/trans_presets.java:2526
+#: build/trans_presets.java:2527 build/trans_presets.java:2817
 msgid "yes"
 msgstr "是"
@@ -22171,9 +22251,9 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2468 build/trans_presets.java:2469
-#: build/trans_presets.java:2510 build/trans_presets.java:2519
-#: build/trans_presets.java:2520 build/trans_presets.java:2521
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:2474 build/trans_presets.java:2475
+#: build/trans_presets.java:2516 build/trans_presets.java:2525
+#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:2817
 msgid "no"
 msgstr "否"
@@ -22432,5 +22512,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:411 build/trans_style.java:3285
+#: build/trans_presets.java:411 build/trans_style.java:3293
 msgid "residential"
 msgstr "居住的"
@@ -22479,5 +22559,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4428
+#: build/trans_style.java:4436
 msgid "service"
 msgstr "巷/弄"
@@ -22512,5 +22592,5 @@
 #. color construction
 #: build/trans_presets.java:411 build/trans_style.java:905
-#: build/trans_style.java:3350 build/trans_style.java:3351
+#: build/trans_style.java:3358 build/trans_style.java:3359
 msgid "construction"
 msgstr "施工"
@@ -22597,5 +22677,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3260
+#: build/trans_presets.java:487 build/trans_presets.java:3266
 msgid "hiking"
 msgstr "健行"
@@ -22630,5 +22710,5 @@
 msgstr "良好"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2052
+#: build/trans_presets.java:490 build/trans_presets.java:2058
 msgid "intermediate"
 msgstr "中級"
@@ -22798,14 +22878,14 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2243
-#: build/trans_presets.java:2345 build/trans_presets.java:2375
-#: build/trans_presets.java:2428 build/trans_presets.java:2436
-#: build/trans_presets.java:2453 build/trans_presets.java:2466
-#: build/trans_presets.java:2475 build/trans_presets.java:2482
-#: build/trans_presets.java:2547 build/trans_presets.java:2557
-#: build/trans_presets.java:2758 build/trans_presets.java:2775
-#: build/trans_presets.java:2790 build/trans_presets.java:2829
-#: build/trans_presets.java:3267
+#: build/trans_presets.java:1403 build/trans_presets.java:1792
+#: build/trans_presets.java:1802 build/trans_presets.java:2249
+#: build/trans_presets.java:2351 build/trans_presets.java:2381
+#: build/trans_presets.java:2434 build/trans_presets.java:2442
+#: build/trans_presets.java:2459 build/trans_presets.java:2472
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2553 build/trans_presets.java:2563
+#: build/trans_presets.java:2764 build/trans_presets.java:2781
+#: build/trans_presets.java:2796 build/trans_presets.java:2835
+#: build/trans_presets.java:3273
 msgid "Operator"
 msgstr "經營者"
@@ -23073,6 +23153,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2943
-#: build/trans_presets.java:2950 build/trans_presets.java:2957
+#: build/trans_presets.java:1772 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2963
 msgid "Elevation"
 msgstr "海拔"
@@ -23520,5 +23600,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1041 build/trans_style.java:3517
+#: build/trans_presets.java:1041 build/trans_style.java:3525
 msgid "marsh"
 msgstr ""
@@ -23924,5 +24004,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2456
+#: build/trans_presets.java:1237 build/trans_presets.java:2462
 msgid "Voltage"
 msgstr "電壓"
@@ -24286,31 +24366,31 @@
 #. item "Health/Veterinary" text "Name"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1696 build/trans_presets.java:1703
-#: build/trans_presets.java:1711 build/trans_presets.java:1724
-#: build/trans_presets.java:1738 build/trans_presets.java:1835
-#: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2283
-#: build/trans_presets.java:2307 build/trans_presets.java:2548
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1713 build/trans_presets.java:1726
+#: build/trans_presets.java:1740 build/trans_presets.java:1841
+#: build/trans_presets.java:1849 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:2289
+#: build/trans_presets.java:2313 build/trans_presets.java:2554
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Opening Hours"
 msgstr "開放時間"
@@ -24370,90 +24450,90 @@
 #. item "Health/Veterinary" combo "Opening Hours"
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "24/7"
 msgstr "24/7"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Mo-Fr 08:30-20:00"
 msgstr "週一-週五 08:30-20:00"
 
 #: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1654 build/trans_presets.java:1661
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1681 build/trans_presets.java:1688
-#: build/trans_presets.java:1703 build/trans_presets.java:1711
-#: build/trans_presets.java:1724 build/trans_presets.java:1738
-#: build/trans_presets.java:1835 build/trans_presets.java:1843
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2283 build/trans_presets.java:2307
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2596 build/trans_presets.java:2602
-#: build/trans_presets.java:2609 build/trans_presets.java:2616
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2654
-#: build/trans_presets.java:2660 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2680
-#: build/trans_presets.java:2687 build/trans_presets.java:2693
-#: build/trans_presets.java:2699 build/trans_presets.java:2705
-#: build/trans_presets.java:2711 build/trans_presets.java:2717
-#: build/trans_presets.java:2724 build/trans_presets.java:2731
-#: build/trans_presets.java:2738 build/trans_presets.java:2744
-#: build/trans_presets.java:2750 build/trans_presets.java:2776
-#: build/trans_presets.java:2784 build/trans_presets.java:2799
-#: build/trans_presets.java:2805 build/trans_presets.java:2813
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1669 build/trans_presets.java:1676
+#: build/trans_presets.java:1683 build/trans_presets.java:1690
+#: build/trans_presets.java:1705 build/trans_presets.java:1713
+#: build/trans_presets.java:1726 build/trans_presets.java:1740
+#: build/trans_presets.java:1841 build/trans_presets.java:1849
+#: build/trans_presets.java:1952 build/trans_presets.java:1958
+#: build/trans_presets.java:2289 build/trans_presets.java:2313
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2602 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2622
+#: build/trans_presets.java:2629 build/trans_presets.java:2635
+#: build/trans_presets.java:2642 build/trans_presets.java:2648
+#: build/trans_presets.java:2654 build/trans_presets.java:2660
+#: build/trans_presets.java:2666 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2686
+#: build/trans_presets.java:2693 build/trans_presets.java:2699
+#: build/trans_presets.java:2705 build/trans_presets.java:2711
+#: build/trans_presets.java:2717 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2737
+#: build/trans_presets.java:2744 build/trans_presets.java:2750
+#: build/trans_presets.java:2756 build/trans_presets.java:2782
+#: build/trans_presets.java:2790 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2819
+#: build/trans_presets.java:2846
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "週二-週日 08:00-15:00; 週六 08:00-12:00"
@@ -24566,7 +24646,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2467
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:1367 build/trans_presets.java:1793
+#: build/trans_presets.java:1803 build/trans_presets.java:2473
+#: build/trans_presets.java:2765
 msgid "Reference number"
 msgstr ""
@@ -24582,5 +24662,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2377
+#: build/trans_presets.java:1368 build/trans_presets.java:2383
 msgid "underground"
 msgstr "地下"
@@ -24593,6 +24673,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:1370 build/trans_presets.java:1794
+#: build/trans_presets.java:1804 build/trans_presets.java:2474
 msgid "Fee"
 msgstr "費用"
@@ -24768,5 +24848,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2469
+#: build/trans_presets.java:1471 build/trans_presets.java:2475
 msgid "Wheelchair"
 msgstr "輪椅"
@@ -24803,6 +24883,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:1494 build/trans_presets.java:1816
+#: build/trans_presets.java:2525
 msgid "Shelter"
 msgstr ""
@@ -24810,5 +24890,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2507
+#: build/trans_presets.java:1495 build/trans_presets.java:2513
 msgid "Bench"
 msgstr "長椅"
@@ -24927,5 +25007,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2399
 msgid "Beacon"
 msgstr ""
@@ -25086,5 +25166,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "Cuisine"
 msgstr "烹調風格"
@@ -25092,73 +25172,78 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "italian"
 msgstr "意大利文"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "chinese"
 msgstr "中文"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "pizza"
 msgstr "披薩"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "burger"
 msgstr "漢堡"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "greek"
 msgstr "希臘文"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "german"
 msgstr "德文"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "indian"
 msgstr "印度料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "regional"
 msgstr "地方料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "turkish"
 msgstr "土耳其料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "asian"
 msgstr "亞洲料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "thai"
 msgstr "泰文"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "mexican"
 msgstr "墨西哥料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "japanese"
 msgstr "日文"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sandwich"
 msgstr "三明治"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1653
+#: build/trans_presets.java:1645 build/trans_presets.java:1654
 msgid "sushi"
 msgstr "壽司"
 
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1647 build/trans_presets.java:1670
+msgid "Microbrewery"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#: build/trans_presets.java:1649
 msgid "Fast Food"
 msgstr "速食"
@@ -25166,17 +25251,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1651
 msgid "Edit Fast Food Restaurant"
 msgstr "編輯速食餐廳"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1654
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1657
 msgid "Cafe"
 msgstr "咖啡"
@@ -25184,9 +25269,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1659
 msgid "Edit Cafe"
 msgstr "編輯咖啡廳"
 
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1664
 msgid "Pub"
 msgstr "酒店"
@@ -25194,18 +25279,19 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1666
 msgid "Edit Pub"
 msgstr "編輯酒店"
 
-#: build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" check "Microbrewery"
+#: build/trans_presets.java:1672
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1673
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1676
+#: build/trans_presets.java:1678
 msgid "Bar"
 msgstr "酒吧"
@@ -25213,9 +25299,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1678
+#: build/trans_presets.java:1680
 msgid "Edit Bar"
 msgstr "編輯酒吧"
 
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1685
 msgid "Nightclub"
 msgstr "夜店"
@@ -25223,24 +25309,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1687
 msgid "Edit Nightclub"
 msgstr "編輯夜店"
 
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1693
 msgid "Tourism"
 msgstr "旅遊相關"
 
 #. group "Tourism"
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1694
 msgid "Attraction"
 msgstr "吸引力點"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1695
 msgid "Edit Attraction"
 msgstr "編輯吸引力點"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1700
 msgid "Museum"
 msgstr "博物館"
@@ -25248,9 +25334,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1702
 msgid "Edit Museum"
 msgstr "編輯博物館"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1707
 msgid "Zoo"
 msgstr "動物園"
@@ -25259,9 +25345,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1710
 msgid "Edit Zoo"
 msgstr "編輯動物園"
 
-#: build/trans_presets.java:1713
+#: build/trans_presets.java:1715
 msgid "Viewpoint"
 msgstr "景點"
@@ -25269,24 +25355,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1717
 msgid "Edit Viewpoint"
 msgstr "編輯景點"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1720
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1722
 msgid "Theme Park"
 msgstr "主題樂園"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1723
 msgid "Edit Theme Park"
 msgstr "編輯主題樂園"
 
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1728
 msgid "Artwork"
 msgstr "藝術工作"
@@ -25294,5 +25380,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1730
 msgid "Edit Artwork"
 msgstr "編輯藝術工作"
@@ -25300,19 +25386,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1735
 msgid "Information Office"
 msgstr "資訊服務處"
 
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1742
 msgid "Map"
 msgstr "地圖"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "topo"
 msgstr ""
@@ -25350,5 +25436,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1745 build/trans_style.java:625
+#: build/trans_presets.java:1747 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25356,28 +25442,28 @@
 msgstr "街"
 
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1747
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "city"
 msgstr "城市"
 
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1748
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1747 build/trans_presets.java:1763
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1749 build/trans_presets.java:1765
+#: build/trans_presets.java:1813
 msgid "Closer Description"
 msgstr ""
@@ -25387,5 +25473,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1751 build/trans_presets.java:1774
 msgid "Routes shown for:"
 msgstr ""
@@ -25393,5 +25479,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
+#: build/trans_presets.java:1752 build/trans_presets.java:1775
 msgid "Hiking"
 msgstr "健走"
@@ -25399,6 +25485,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:1753 build/trans_presets.java:1776
+#: build/trans_presets.java:1998
 msgid "Cycling"
 msgstr "自行車"
@@ -25406,5 +25492,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1754 build/trans_presets.java:1777
 msgid "Mountainbiking"
 msgstr ""
@@ -25412,6 +25498,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:2052
 msgid "Skiing"
 msgstr "滑雪"
@@ -25419,5 +25505,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1756 build/trans_presets.java:1779
 msgid "Riding"
 msgstr ""
@@ -25425,46 +25511,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
+#: build/trans_presets.java:1757 build/trans_presets.java:1780
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1759
 msgid "Information Board"
 msgstr "資訊板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "history"
 msgstr "歷史"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "wildlife"
 msgstr "野生"
 
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1764
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1767
 msgid "Guidepost"
 msgstr "路牌"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1782
+msgid "Flagpole"
+msgstr ""
+
+#. item "Tourism/Flagpole"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+#. <key key="man_made" value="flagpole" />
+#: build/trans_presets.java:1786
 msgid "Information Terminal"
 msgstr ""
@@ -25472,29 +25565,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
+#: build/trans_presets.java:1791 build/trans_presets.java:1801
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1796
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1806
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1807
 msgid "Phone number"
 msgstr "電話號碼"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
 msgid "Other Information Points"
 msgstr "其他的資訊點"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1817
 msgid "Edit Shelter"
 msgstr ""
@@ -25502,25 +25595,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1814 build/trans_presets.java:1820
+#: build/trans_presets.java:1820 build/trans_presets.java:1826
 msgid "Fireplace"
 msgstr "壁爐"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1822
 msgid "Picnic Site"
 msgstr "野餐區"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1823
 msgid "Edit Picnic Site"
 msgstr "編輯野餐區"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1829
 msgid "Historic Places"
 msgstr "歷史地區"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1830
 msgid "Castle"
 msgstr "城堡"
@@ -25529,19 +25622,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1833
 msgid "Edit Castle"
 msgstr "編輯城堡"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1837
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1838
 msgid "Edit Ruins"
 msgstr "編輯遺跡"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1843
 msgid "Archaeological Site"
 msgstr "考古學地區"
@@ -25550,9 +25643,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1846
 msgid "Edit Archaeological Site"
 msgstr "編輯考古學地區"
 
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
 msgid "Battlefield"
 msgstr "戰場"
@@ -25560,10 +25653,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Edit Battlefield"
 msgstr "編輯戰場"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
 msgid "Palaeontological Site"
 msgstr ""
@@ -25571,5 +25664,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25577,15 +25670,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Monument"
 msgstr "紀念建築"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Monument"
 msgstr "編輯紀念建築"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Memorial"
 msgstr "紀念碑"
@@ -25593,55 +25686,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1871
 msgid "Edit Memorial"
 msgstr "編輯紀念碑"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1880
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
 msgid "Boundary Stone"
 msgstr "邊界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1886
 msgid "Edit Boundary Stone"
 msgstr "編輯邊界石"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1891
 msgid "Leisure"
 msgstr "休閒"
 
 #. group "Leisure"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1892
 msgid "Water Park"
 msgstr "水上樂園"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1893
 msgid "Edit Water Park"
 msgstr "編輯水上樂園"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Playground"
 msgstr "運動場"
@@ -25649,35 +25742,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:1899
 msgid "Edit Playground"
 msgstr "編輯運動場"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1903
 msgid "Fishing"
 msgstr "釣魚"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1904
 msgid "Edit Fishing"
 msgstr "編輯釣魚場"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2740
+#: build/trans_presets.java:1910 build/trans_presets.java:2746
 msgid "Sports"
 msgstr "運動用品"
 
 #. group "Sports"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1911
 msgid "Sport Facilities"
 msgstr "運動設施"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1912
 msgid "Stadium"
 msgstr "競技場"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1913
 msgid "Edit Stadium"
 msgstr "編輯競技揚"
@@ -25691,6 +25784,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1911 build/trans_presets.java:1920
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1944
 msgid "select sport:"
 msgstr "選擇運動："
@@ -26106,31 +26199,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
-#: build/trans_style.java:3738 build/trans_style.java:3746
-#: build/trans_style.java:3754 build/trans_style.java:3762
-#: 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_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 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
 msgid "sport"
 msgstr "運動"
@@ -26140,240 +26233,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "multi"
 msgstr "多種"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "archery"
 msgstr "射箭"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "athletics"
 msgstr "田徑"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "australian_football"
 msgstr "澳洲足球"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "baseball"
 msgstr "棒球"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "basketball"
 msgstr "籃球"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "bowls"
 msgstr "保齡球"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "canoe"
 msgstr "獨木舟"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "climbing"
 msgstr "攀岩"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "croquet"
 msgstr "木球"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "cycling"
 msgstr "自行車"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "dog_racing"
 msgstr "賽狗"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "equestrian"
 msgstr "馬術"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "golf"
 msgstr "高爾夫"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "gymnastics"
 msgstr "體操"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "hockey"
 msgstr "曲棍球"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "horse_racing"
 msgstr "賽馬"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "motor"
 msgstr "摩托車"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "shooting"
 msgstr "射擊"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "skiing"
 msgstr "滑雪"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "soccer"
 msgstr "足球"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "swimming"
 msgstr "游泳"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "table_tennis"
 msgstr "桌球"
 
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
-#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1937 build/trans_presets.java:1946
 msgid "tennis"
 msgstr "網球"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1921
 msgid "Sports Centre"
 msgstr "運動中心"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1922
 msgid "Edit Sports Centre"
 msgstr "編輯運動中心"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1930
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1931
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:1940
 msgid "Edit Racetrack"
 msgstr "編輯跑道"
 
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1948
 msgid "Golf Course"
 msgstr "高爾夫路線"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1949
 msgid "Edit Golf Course"
 msgstr "編輯高爾夫路線"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1954
 msgid "Miniature Golf"
 msgstr "迷你高爾夫"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
 msgid "Edit Miniature Golf"
 msgstr "編輯迷你高爾夫"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
 msgid "Sport"
 msgstr "運動"
 
 #. group "Sport"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
 msgid "Multi"
 msgstr "多種"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1963
 msgid "Edit Multi"
 msgstr "編輯多種"
@@ -26415,23 +26508,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "type"
 msgstr "類型"
@@ -26473,211 +26566,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "sports_centre"
 msgstr "運動中心"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "stadium"
 msgstr "競技揚"
 
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2044 build/trans_presets.java:2053
-#: build/trans_presets.java:2060 build/trans_presets.java:2068
-#: build/trans_presets.java:2074 build/trans_presets.java:2080
-#: build/trans_presets.java:2086 build/trans_presets.java:2092
-#: build/trans_presets.java:2098 build/trans_presets.java:2104
-#: build/trans_presets.java:2110 build/trans_presets.java:2116
-#: build/trans_presets.java:2122 build/trans_presets.java:2128
-#: build/trans_presets.java:2134 build/trans_presets.java:2140
-#: build/trans_presets.java:2146 build/trans_presets.java:2152
-#: build/trans_presets.java:2158 build/trans_presets.java:2164
-#: build/trans_presets.java:2170 build/trans_presets.java:2176
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:1966 build/trans_presets.java:1972
+#: build/trans_presets.java:1978 build/trans_presets.java:1984
+#: build/trans_presets.java:1990 build/trans_presets.java:1996
+#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2014 build/trans_presets.java:2020
+#: build/trans_presets.java:2026 build/trans_presets.java:2032
+#: build/trans_presets.java:2038 build/trans_presets.java:2044
+#: build/trans_presets.java:2050 build/trans_presets.java:2059
+#: build/trans_presets.java:2066 build/trans_presets.java:2074
+#: build/trans_presets.java:2080 build/trans_presets.java:2086
+#: build/trans_presets.java:2092 build/trans_presets.java:2098
+#: build/trans_presets.java:2104 build/trans_presets.java:2110
+#: build/trans_presets.java:2116 build/trans_presets.java:2122
+#: build/trans_presets.java:2128 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2146
+#: build/trans_presets.java:2152 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2170
+#: build/trans_presets.java:2176 build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1969
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
 msgid "Athletics"
 msgstr "田徑"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1975
 msgid "Edit Athletics"
 msgstr "編輯田徑"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
 msgid "Archery"
 msgstr "射箭"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1981
 msgid "Edit Archery"
 msgstr "編輯射箭"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1987
 msgid "Edit Climbing"
 msgstr "編輯攀岩"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
 msgid "Canoeing"
 msgstr "獨木舟"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1993
 msgid "Edit Canoeing"
 msgstr "編輯獨木舟"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1999
 msgid "Edit Cycling"
 msgstr "編輯自行車"
 
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
 msgid "Dog Racing"
 msgstr "賽狗"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2005
 msgid "Edit Dog Racing"
 msgstr "編輯賽狗"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
 msgid "Equestrian"
 msgstr "馬術"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2011
 msgid "Edit Equestrian"
 msgstr "編輯馬術"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
 msgid "Horse Racing"
 msgstr "賽馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2017
 msgid "Edit Horse Racing"
 msgstr "編輯賽馬"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
 msgid "Gymnastics"
 msgstr "體操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2023
 msgid "Edit Gymnastics"
 msgstr "編輯體操"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
 msgid "Motor Sports"
 msgstr "摩托車運動"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2029
 msgid "Edit Motor Sports"
 msgstr "編輯摩托車運動"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
 msgid "Skating"
 msgstr "溜冰"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2035
 msgid "Edit Skating"
 msgstr "編輯溜冰"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2040
 msgid "Skateboard"
 msgstr "滑板"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Edit Skateboard"
 msgstr "編輯滑板"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2046
 msgid "Swimming"
 msgstr "游泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Swimming"
 msgstr "編輯游泳"
@@ -26685,52 +26778,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Edit Skiing"
 msgstr "編輯滑雪"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2057
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "Difficulty"
 msgstr "困難度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "novice"
 msgstr "新手"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "easy"
 msgstr "容易"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "advanced"
 msgstr "進階"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "expert"
 msgstr "專家"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2058
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Shooting"
 msgstr "射擊"
@@ -26738,204 +26831,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
 msgid "Edit Shooting"
 msgstr "編輯射擊"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
 msgid "Sport (Ball)"
 msgstr "運動（球類）"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
 msgid "Soccer"
 msgstr "足球"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2071
 msgid "Edit Soccer"
 msgstr "編輯足球"
 
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2077
 msgid "Edit Australian Football"
 msgstr "編輯澳洲足球"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2083
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2089
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2095
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2101
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2107
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
 msgid "Baseball"
 msgstr "棒球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2113
 msgid "Edit Baseball"
 msgstr "編輯棒球"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
 msgid "Basketball"
 msgstr "籃球"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2119
 msgid "Edit Basketball"
 msgstr "編輯籃球"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
 msgid "Golf"
 msgstr "高爾夫"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2125
 msgid "Edit Golf"
 msgstr "編輯高爾夫"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2128
 msgid "golf_course"
 msgstr "高爾夫路線"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2131
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
 msgid "Bowls"
 msgstr "保齡球"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2137
 msgid "Edit Bowls"
 msgstr "編輯保齡球"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2143
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2149
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "Croquet"
 msgstr "木球"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2155
 msgid "Edit Croquet"
 msgstr "編輯木球"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2161
 msgid "Edit Hockey"
 msgstr "編曲棍球"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2166
 msgid "Pelota"
 msgstr "回力球"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2167
 msgid "Edit Pelota"
 msgstr "編輯回力球"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2172
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2178
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
 msgid "Edit Table Tennis"
 msgstr "編輯桌球"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Tennis"
 msgstr "網球"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2185
 msgid "Edit Tennis"
 msgstr "編輯網路"
 
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2192
 msgid "Man-Made"
 msgstr "人造物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2194
 msgid "Building"
 msgstr "建築物"
@@ -26943,5 +27036,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2197
 msgid "Public Building"
 msgstr "公共建築"
@@ -26949,10 +27042,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Public Building"
 msgstr "編輯公共建築"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Town hall"
 msgstr "縣市政府/公所"
@@ -26960,10 +27053,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2205
 msgid "Edit Town hall"
 msgstr "編輯縣市政府/公所"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2209
 msgid "Embassy"
 msgstr "大使館"
@@ -26971,10 +27064,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2211
 msgid "Edit Embassy"
 msgstr "編輯大使館"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2215
 msgid "Courthouse"
 msgstr "法院"
@@ -26983,10 +27076,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Edit Courthouse"
 msgstr "編輯法院"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2222
 msgid "Prison"
 msgstr "監獄"
@@ -26995,10 +27088,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit Prison"
 msgstr "編輯監獄"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "Police"
 msgstr "警察局"
@@ -27008,10 +27101,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
 msgid "Edit Police"
 msgstr "編輯警察局"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Fire Station"
 msgstr "消防隊"
@@ -27020,10 +27113,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2240
 msgid "Edit Fire Station"
 msgstr "編輯消防隊"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2244
 msgid "Post Office"
 msgstr "郵局"
@@ -27031,5 +27124,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2246
 msgid "Edit Post Office"
 msgstr "編輯郵局"
@@ -27037,15 +27130,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2253
 msgid "Edit Kindergarten"
 msgstr "編輯幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "School"
 msgstr "學校"
@@ -27053,10 +27146,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit School"
 msgstr "編輯學校"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "University"
 msgstr "大學"
@@ -27064,10 +27157,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2265
 msgid "Edit University"
 msgstr "編輯大學"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2269
 msgid "College"
 msgstr "學院"
@@ -27075,5 +27168,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2271
 msgid "Edit College"
 msgstr "編輯學院"
@@ -27081,5 +27174,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2276
 msgid "Cinema"
 msgstr "電影院"
@@ -27088,10 +27181,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2279
 msgid "Edit Cinema"
 msgstr "編輯電影院"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2283
 msgid "Library"
 msgstr "圖書館"
@@ -27100,9 +27193,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2286
 msgid "Edit Library"
 msgstr "編輯圖書館"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "Arts Centre"
 msgstr "美術館"
@@ -27110,10 +27203,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Edit Arts Centre"
 msgstr "編輯美術館"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2297
 msgid "Theatre"
 msgstr "劇院"
@@ -27122,10 +27215,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2300
 msgid "Edit Theatre"
 msgstr "編輯劇院"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Place of Worship"
 msgstr "宗教儀式場所"
@@ -27135,5 +27228,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2308
 msgid "Edit Place of Worship"
 msgstr "編輯宗教儀式場所"
@@ -27142,6 +27235,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "Religion"
 msgstr "宗教"
@@ -27150,66 +27243,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "bahai"
 msgstr "巴海大同教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "buddhist"
 msgstr "佛教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "christian"
 msgstr "基督教系"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "hindu"
 msgstr "印度教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jain"
 msgstr "耆那教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "jewish"
 msgstr "猶太教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "muslim"
 msgstr "回教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "sikh"
 msgstr "錫克教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2305 build/trans_presets.java:3130
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:2311 build/trans_presets.java:3136
+#: build/trans_presets.java:3145
 msgid "zoroastrian"
 msgstr "祆教"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "Denomination"
 msgstr "教派"
@@ -27218,81 +27311,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "anglican"
 msgstr "英國國教"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "baptist"
 msgstr "浸信會"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "catholic"
 msgstr "天主教"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "evangelical"
 msgstr "福音派教會"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "lutheran"
 msgstr "路德教派"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "methodist"
 msgstr "衛理公會教"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "mormon"
 msgstr "摩門教"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "orthodox"
 msgstr "東正教"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "pentecostal"
 msgstr "聖靈降臨教派"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "presbyterian"
 msgstr "長老派教會"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "protestant"
 msgstr "新教"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "quaker"
 msgstr "教友派"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "shia"
 msgstr "什葉派"
 
-#: build/trans_presets.java:2306 build/trans_presets.java:3131
-#: build/trans_presets.java:3140
+#: build/trans_presets.java:2312 build/trans_presets.java:3137
+#: build/trans_presets.java:3146
 msgid "sunni"
 msgstr "遜尼派"
 
 #. <separator/>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Addresses"
 msgstr "地址"
@@ -27301,5 +27394,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2319
 msgid "Edit Address Information"
 msgstr "編輯地址資訊"
@@ -27307,5 +27400,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "House number"
 msgstr "門牌號碼"
@@ -27313,25 +27406,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2323
 msgid "House name"
 msgstr "房屋名稱"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2324
 msgid "Street name"
 msgstr "街道名稱"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "City name"
 msgstr "城市名稱"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Post code"
 msgstr "郵遞區號"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2327
 msgid "Country code"
 msgstr "國碼"
@@ -27340,5 +27433,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2333
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -27346,61 +27439,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "Numbering scheme"
 msgstr "編號規則"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "odd"
 msgstr "奇數"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "even"
 msgstr "偶數"
 
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2335
 msgid "alphabetic"
 msgstr "按字母順序"
 
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Man Made"
 msgstr "人造物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2339
 msgid "Works"
 msgstr "作品"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
 msgid "Edit Works"
 msgstr "編輯作品"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2344
 msgid "Tower"
 msgstr "塔"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Tower"
 msgstr "編輯塔"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "Tower type"
 msgstr "塔類型"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "communication"
 msgstr "通訊"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "observation"
 msgstr "觀測"
 
 #. <optional>
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2350
 msgid "Height (meters)"
 msgstr "高度（米）"
@@ -27408,25 +27501,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2354
 msgid "Water Tower"
 msgstr "貯水塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Water Tower"
 msgstr "編輯貯水塔"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Gasometer"
 msgstr "貯氣桶"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2360
 msgid "Edit Gasometer"
 msgstr "編輯貯氣桶"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2364
 msgid "Lighthouse"
 msgstr "燈塔"
@@ -27434,10 +27527,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2366
 msgid "Edit Lighthouse"
 msgstr "編輯燈塔"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2370
 msgid "Windmill"
 msgstr "風車"
@@ -27445,10 +27538,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2372
 msgid "Edit Windmill"
 msgstr "編輯風車"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2376
 msgid "Pipeline"
 msgstr "油管"
@@ -27457,41 +27550,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Pipeline"
 msgstr "編輯油管"
 
-#: build/trans_presets.java:2376 build/trans_presets.java:2419
+#: build/trans_presets.java:2382 build/trans_presets.java:2425
 msgid "gas"
 msgstr "天然氣"
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2382
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "Location"
 msgstr "位置"
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2383
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2385
 msgid "Wastewater Plant"
 msgstr "汙水處理廠"
@@ -27501,10 +27594,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2389
 msgid "Edit Wastewater Plant"
 msgstr "編輯汙水處理廠"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Crane"
 msgstr "起重機"
@@ -27512,5 +27605,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2395
 msgid "Edit Crane"
 msgstr "編輯起重機"
@@ -27518,10 +27611,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2401
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Survey Point"
 msgstr "測量點"
@@ -27529,10 +27622,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2407
 msgid "Edit Survey Point"
 msgstr "編輯測量點"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2411
 msgid "Surveillance"
 msgstr "監視"
@@ -27540,23 +27633,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2413
 msgid "Edit Surveillance Camera"
 msgstr "編輯監視攝影機"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "outdoor"
 msgstr "戶外"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Generator"
 msgstr "發電廠"
@@ -27566,35 +27659,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Edit Power Generator"
 msgstr "編輯發電廠"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "wind"
 msgstr "風力"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "hydro"
 msgstr "水力"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "fossil"
 msgstr "燃油"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "nuclear"
 msgstr "核能"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "coal"
 msgstr "燃媒"
 
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2425
 msgid "photovoltaic"
 msgstr "光電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Power Station"
 msgstr "發電廠"
@@ -27603,10 +27696,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Edit Power Station"
 msgstr "編輯發電廠"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2437
 msgid "Power Sub Station"
 msgstr ""
@@ -27615,5 +27708,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2440
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -27621,10 +27714,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2437 build/trans_presets.java:2454
+#: build/trans_presets.java:2443 build/trans_presets.java:2460
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2445
 msgid "Power Tower"
 msgstr "電塔"
@@ -27635,23 +27728,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2450
 msgid "Edit Power Tower"
 msgstr "編輯電塔"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2451
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2452
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2454
 msgid "Power Line"
 msgstr "電線"
@@ -27660,78 +27753,76 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Edit Power Line"
 msgstr "編輯電線"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2458
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2452
-#, fuzzy
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "line"
-msgstr "上線"
-
-#: build/trans_presets.java:2452
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2458
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr "上線"
+msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2463
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Amenities"
 msgstr "便利設施"
 
 #. group "Amenities"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Toilets"
 msgstr "廁所"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2470 build/trans_presets.java:2760
+#: build/trans_presets.java:2476 build/trans_presets.java:2766
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2478
 msgid "Post Box"
 msgstr "郵筒"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Telephone"
 msgstr "電話"
@@ -27740,5 +27831,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2486
 msgid "Edit Telephone"
 msgstr "編輯電話"
@@ -27746,5 +27837,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2483 build/trans_presets.java:2761
+#: build/trans_presets.java:2489 build/trans_presets.java:2767
 msgid "Coins"
 msgstr "硬幣"
@@ -27752,5 +27843,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2484 build/trans_presets.java:2762
+#: build/trans_presets.java:2490 build/trans_presets.java:2768
 msgid "Notes"
 msgstr ""
@@ -27758,5 +27849,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2485 build/trans_presets.java:2763
+#: build/trans_presets.java:2491 build/trans_presets.java:2769
 msgid "Electronic purses and Charge cards"
 msgstr "電子錢包或收費卡"
@@ -27764,5 +27855,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2486 build/trans_presets.java:2764
+#: build/trans_presets.java:2492 build/trans_presets.java:2770
 msgid "Debit cards"
 msgstr ""
@@ -27770,15 +27861,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2487 build/trans_presets.java:2765
+#: build/trans_presets.java:2493 build/trans_presets.java:2771
 msgid "Credit cards"
 msgstr "信用卡"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Telephone cards"
 msgstr "電話卡"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2496
 msgid "Recycling"
 msgstr "資源回收"
@@ -27787,5 +27878,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2499
 msgid "Edit Recycling station"
 msgstr "資源回收站"
@@ -27793,35 +27884,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Batteries"
 msgstr "電池"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2502
 msgid "Cans"
 msgstr "瓶罐"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Clothes"
 msgstr "衣服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2504
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2505
 msgid "Paper"
 msgstr "紙張"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2506
 msgid "Scrap Metal"
 msgstr "廢金屬"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2508
 msgid "Waste Basket"
 msgstr ""
@@ -27829,5 +27920,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27836,31 +27927,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Material"
 msgstr "材質"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "stone"
 msgstr "石頭"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "plastic"
 msgstr "塑膠"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "Colour"
 msgstr "顏色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "black"
 msgstr "黑色"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "brown"
 msgstr "淺褐色"
@@ -27939,39 +28030,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2512 build/trans_style.java:3190
-#: build/trans_style.java:3198 build/trans_style.java:3206
-#: build/trans_style.java:3214 build/trans_style.java:3222
-#: build/trans_style.java:3269 build/trans_style.java:3277
-#: build/trans_style.java:3375 build/trans_style.java:3383
+#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_style.java:3206 build/trans_style.java:3214
+#: build/trans_style.java:3222 build/trans_style.java:3230
+#: build/trans_style.java:3277 build/trans_style.java:3285
+#: build/trans_style.java:3383 build/trans_style.java:3391
 msgid "green"
 msgstr "綠色"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "red"
 msgstr "紅色"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "blue"
 msgstr "藍色"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "gray"
 msgstr "灰色"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2518
 msgid "white"
 msgstr "白色"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2519
 msgid "Amount of Seats"
 msgstr "座椅數量"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2521
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27980,30 +28071,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2518 build/trans_presets.java:3000
+#: build/trans_presets.java:2524 build/trans_presets.java:3006
 msgid "Height"
 msgstr "高度"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "low"
 msgstr "低"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "half"
 msgstr "半高"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "full"
 msgstr "全高"
 
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2526
 msgid "Hide"
 msgstr "隱藏"
 
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2527
 msgid "Lock"
 msgstr "鎖"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Fountain"
 msgstr "噴泉"
@@ -28012,10 +28103,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2532
 msgid "Edit Fountain"
 msgstr "編輯噴泉"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Drinking Water"
 msgstr "飲水機"
@@ -28024,10 +28115,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2539
 msgid "Edit Drinking Water"
 msgstr "編輯飲水機"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Fire Hydrant"
 msgstr "消防栓"
@@ -28036,5 +28127,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2546
 msgid "Edit Fire Hydrant"
 msgstr "編輯消防栓"
@@ -28042,5 +28133,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2549
 msgid "Baby Hatch"
 msgstr "棄嬰保護艙"
@@ -28048,15 +28139,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2551
 msgid "Edit Baby Hatch"
 msgstr "編輯棄嬰保護艙"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2557
 msgid "Shops"
 msgstr "商店"
 
 #. group "Shops"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2558
 msgid "Car Dealer"
 msgstr "汽車經銷商"
@@ -28064,10 +28155,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2560
 msgid "Edit Car Shop"
 msgstr "編輯汽車商店"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Bike Dealer"
 msgstr "自行車經銷商"
@@ -28076,28 +28167,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
 msgid "Edit Bicycle Shop"
 msgstr "編輯自行車商店"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Supermarket"
 msgstr "超級市場"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
 msgid "Edit Supermarket"
 msgstr "編輯超級市場"
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2578
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Convenience Store"
 msgstr "便利商店"
@@ -28105,9 +28196,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2586
 msgid "Edit Convenience Store"
 msgstr "編輯便利商店"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2591
 msgid "Kiosk"
 msgstr ""
@@ -28115,27 +28206,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2593
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Book Store"
 msgstr "書店"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2599
 msgid "Edit Book Store"
 msgstr "編輯書店"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Travel Agency"
 msgstr "旅行社"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2605
 msgid "Edit Travel Agency"
 msgstr "編輯旅行社"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Butcher"
 msgstr "肉類"
@@ -28143,9 +28234,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2612
 msgid "Edit Butcher"
 msgstr "編輯肉店"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2617
 msgid "Baker"
 msgstr "麵包類"
@@ -28153,9 +28244,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
 msgid "Edit Baker"
 msgstr "編輯麵包店"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2624
 msgid "Florist"
 msgstr "花類"
@@ -28163,18 +28254,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
 msgid "Edit Florist"
 msgstr "編輯花店"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
 msgid "Organic"
 msgstr "有機產品"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
 msgid "Edit Organic Shop"
 msgstr "編輯有機產品商店"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
 msgid "Alcohol"
 msgstr "酒類"
@@ -28182,54 +28273,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2639
 msgid "Edit Alcohol Shop"
 msgstr "編輯賣酒的商店"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2644
 msgid "Beverages"
 msgstr "飲料類"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2645
 msgid "Edit Beverages Shop"
 msgstr "編輯飲料店"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2650
 msgid "Computer"
 msgstr "電腦類"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2651
 msgid "Edit Computer Shop"
 msgstr "編輯電腦商店"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2656
 msgid "Electronics"
 msgstr "電子材料"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2657
 msgid "Edit Electronics Shop"
 msgstr "編輯電子材料行"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2662
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2663
 msgid "Edit Hifi Shop"
 msgstr "編輯 Hifi 音響店"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2668
 msgid "Furniture"
 msgstr "傢俱類"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2669
 msgid "Edit Furniture Shop"
 msgstr "編輯傢俱店"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2674
 msgid "Garden Centre"
 msgstr "園藝中心"
@@ -28237,9 +28328,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
 msgid "Edit Garden Centre"
 msgstr "編輯園藝中心"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2681
 msgid "Hardware"
 msgstr "硬體"
@@ -28247,9 +28338,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
 msgid "Edit Hardware Store"
 msgstr "編輯硬體商店"
 
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
 msgid "Do-it-yourself-store"
 msgstr "DIY 商店"
@@ -28257,54 +28348,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2690
 msgid "Edit Do-it-yourself-store"
 msgstr "編輯 DIY 商店"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2695
 msgid "Stationery"
 msgstr "文具類"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2696
 msgid "Edit Stationery Shop"
 msgstr "編輯文具店"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2701
 msgid "Hairdresser"
 msgstr "美髮類"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2702
 msgid "Edit Hairdresser"
 msgstr "編輯美髮店"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2707
 msgid "Shoes"
 msgstr "鞋類"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2708
 msgid "Edit Shoe Shop"
 msgstr "編輯鞋店"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Toys"
 msgstr "玩具類"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Edit Toy Shop"
 msgstr "編輯玩具店"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2719
 msgid "Video"
 msgstr "影片類"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2720
 msgid "Edit Video Shop"
 msgstr "編輯影片類商店"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Dry Cleaning"
 msgstr "乾洗類"
@@ -28312,9 +28403,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2727
 msgid "Edit Dry Cleaning"
 msgstr "編輯乾洗店"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Laundry"
 msgstr "洗衣店"
@@ -28322,9 +28413,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2734
 msgid "Edit Laundry"
 msgstr "編輯洗衣店"
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2739
 msgid "Outdoor"
 msgstr "戶外用品"
@@ -28332,24 +28423,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2741
 msgid "Edit Outdoor Shop"
 msgstr "編輯戶外用品店"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2747
 msgid "Edit Sports Shop"
 msgstr "編輯運動用品店"
 
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2752
 msgid "Optician"
 msgstr "眼鏡類"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Optician"
 msgstr "編輯眼鏡行"
 
 #. <separator/>
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Vending machine"
 msgstr "自動販賣機"
@@ -28357,5 +28448,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Vending machine"
 msgstr "編輯自動販賣機"
@@ -28363,97 +28454,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "Vending products"
 msgstr "販賣產品"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "food"
 msgstr "食物"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "sweets"
 msgstr "甜點"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "cigarettes"
 msgstr "菸"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "photos"
 msgstr "相片"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "animal_food"
 msgstr "飼料"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "news_papers"
 msgstr "報紙"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "toys"
 msgstr "玩具"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "stamps"
 msgstr "郵票"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "SIM-cards"
 msgstr "SIM-卡"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "condoms"
 msgstr "保險套"
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2763
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "Cash"
 msgstr "現金"
 
 #. group "Cash"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
 msgid "Bank"
 msgstr "銀行"
@@ -28461,14 +28552,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Edit Bank"
 msgstr "編輯銀行"
 
-#: build/trans_presets.java:2777 build/trans_presets.java:2786
+#: build/trans_presets.java:2783 build/trans_presets.java:2792
 msgid "Automated Teller Machine"
 msgstr "自動提款機(ATM)"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2785
 msgid "Money Exchange"
 msgstr "金錢兌換所"
@@ -28476,5 +28567,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2787
 msgid "Edit Money Exchange"
 msgstr "編輯金錢兌換所"
@@ -28482,15 +28573,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2794
 msgid "Edit Automated Teller Machine"
 msgstr "編輯自動提款機"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2799
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2800
 msgid "Doctors"
 msgstr "醫師"
@@ -28498,18 +28589,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "Edit Doctors"
 msgstr "編輯醫師"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2807
 msgid "Dentist"
 msgstr "牙醫"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Edit Dentist"
 msgstr "編輯牙醫"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2813
 msgid "Pharmacy"
 msgstr "藥局"
@@ -28517,5 +28608,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit Pharmacy"
 msgstr "編輯藥局"
@@ -28523,9 +28614,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2817
 msgid "Dispensing"
 msgstr "配藥"
 
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "Hospital"
 msgstr "醫院"
@@ -28533,10 +28624,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2823
 msgid "Edit Hospital"
 msgstr "編輯醫院"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Emergency Access Point"
 msgstr "緊急連絡點"
@@ -28545,5 +28636,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2830
 msgid "Edit Emergency Access Point"
 msgstr "編輯緊急連絡點"
@@ -28552,20 +28643,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2833
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Phone Number"
 msgstr "電話號碼"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2837
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用國際碼，像是 +12-345-67890)"
@@ -28573,5 +28664,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
 msgid "Veterinary"
 msgstr "獸醫"
@@ -28580,64 +28671,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2843
 msgid "Edit Veterinary"
 msgstr "編輯獸醫"
 
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2850
 msgid "Geography"
 msgstr "地理學"
 
 #. group "Geography"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2851
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2852
 msgid "Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2853
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2858
 msgid "Country"
 msgstr "國家"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2859
 msgid "Edit Country"
 msgstr "編輯國家"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2864
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2865
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2871
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "County"
 msgstr "縣"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2877
 msgid "Edit County"
 msgstr "編輯縣"
@@ -28645,15 +28736,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2883
 msgid "City"
 msgstr "市"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit City"
 msgstr "編輯市"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Town"
 msgstr "鄉/鎮"
@@ -28661,10 +28752,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Town"
 msgstr "編輯鄉/鎮"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Suburb"
 msgstr "郊區"
@@ -28672,25 +28763,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Suburb"
 msgstr "編輯郊區"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2903
 msgid "Village"
 msgstr "村/里"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Edit Village"
 msgstr "編輯村/里"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2909
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2910
 msgid "Edit Hamlet"
 msgstr ""
@@ -28698,5 +28789,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2916
 msgid "Locality"
 msgstr ""
@@ -28704,10 +28795,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Island"
 msgstr "島嶼"
@@ -28715,10 +28806,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2925
 msgid "Edit Island"
 msgstr "編輯島嶼"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Islet"
 msgstr ""
@@ -28726,5 +28817,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2932
 msgid "Edit Islet"
 msgstr ""
@@ -28732,5 +28823,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2938
 msgid "Cave Entrance"
 msgstr "洞窟入口"
@@ -28738,10 +28829,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Cave Entrance"
 msgstr "編輯洞窟入口"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2944
 msgid "Peak"
 msgstr "峰"
@@ -28749,10 +28840,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2946
 msgid "Edit Peak"
 msgstr "編輯山峰"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2951
 msgid "Glacier"
 msgstr "冰河"
@@ -28760,10 +28851,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2953
 msgid "Edit Glacier"
 msgstr "編輯冰河"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Volcano"
 msgstr "火山"
@@ -28771,70 +28862,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2960
 msgid "Edit Volcano"
 msgstr "編輯火山"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2966
 msgid "Boundaries"
 msgstr "邊界"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2967
 msgid "National"
 msgstr "國界"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2968
 msgid "Edit National Boundary"
 msgstr "編輯國界"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2973
 msgid "Administrative"
 msgstr "行政區"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2974
 msgid "Edit Administrative Boundary"
 msgstr "編輯行政區邊界"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2979
 msgid "Civil"
 msgstr "城市的"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Edit Civil Boundary"
 msgstr "編輯城市邊界"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2985
 msgid "Political"
 msgstr "政治的"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Edit Political Boundary"
 msgstr "編輯政治的邊界"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2991
 msgid "National park"
 msgstr "國家公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2992
 msgid "Edit National Park Boundary"
 msgstr "編輯國家公園"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:2998
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2999
 msgid "Tree"
 msgstr "樹"
@@ -28843,15 +28934,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Tree"
 msgstr "編輯樹"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Botanical Name"
 msgstr "植物學名"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3009
 msgid "Wood"
 msgstr ""
@@ -28860,5 +28951,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
 msgid "Edit Wood"
 msgstr ""
@@ -28866,17 +28957,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "coniferous"
 msgstr "松類"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "deciduous"
 msgstr "落葉類"
 
-#: build/trans_presets.java:3009 build/trans_presets.java:3018
+#: build/trans_presets.java:3015 build/trans_presets.java:3024
 msgid "mixed"
 msgstr "混合"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3017
 msgid "Forest"
 msgstr "森林"
@@ -28885,14 +28976,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Forest Landuse"
 msgstr "編輯森林土地利用"
 
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Nature Reserve"
 msgstr "自然保育"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Nature Reserve"
 msgstr "編輯自然保育"
@@ -28900,25 +28991,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3038
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3042
 msgid "Fell"
 msgstr ""
@@ -28926,10 +29017,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3048
 msgid "Heath"
 msgstr ""
@@ -28937,5 +29028,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Edit Heath"
 msgstr ""
@@ -28943,5 +29034,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Farmyard"
 msgstr ""
@@ -28950,45 +29041,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3058
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Farmland"
 msgstr "農田"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Farmland Landuse"
 msgstr "編輯農田土地利用"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Meadow"
 msgstr "青草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3070
 msgid "Edit Meadow Landuse"
 msgstr "編輯青草地土地利用"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3075
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3081
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3082
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28996,25 +29087,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3088
 msgid "Garden"
 msgstr "花園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3089
 msgid "Edit Garden"
 msgstr "編輯花園"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3094
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Village Green"
 msgstr ""
@@ -29022,10 +29113,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Common"
 msgstr ""
@@ -29033,20 +29124,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3108
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3113
 msgid "Edit Park"
 msgstr "編輯公園"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3117
 msgid "Recreation Ground"
 msgstr ""
@@ -29054,5 +29145,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29060,15 +29151,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3126
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Graveyard"
 msgstr ""
@@ -29076,9 +29167,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3133
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3139
 msgid "Cemetery"
 msgstr ""
@@ -29086,39 +29177,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3141
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3148
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3149
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3154
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3155
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3160
 msgid "Industrial"
 msgstr "工業區"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3161
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Railway land"
 msgstr ""
@@ -29126,15 +29217,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3173
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
 msgid "Edit Military Landuse"
 msgstr ""
@@ -29142,50 +29233,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3180
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3187
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3193
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3204
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3205
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -29195,5 +29286,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3217
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29205,5 +29296,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3217 build/trans_presets.java:3234
+#: build/trans_presets.java:3223 build/trans_presets.java:3240
 msgid "outer segment"
 msgstr ""
@@ -29211,5 +29302,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3218 build/trans_presets.java:3235
+#: build/trans_presets.java:3224 build/trans_presets.java:3241
 msgid "inner segment"
 msgstr ""
@@ -29217,5 +29308,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3227
 msgid "Boundary"
 msgstr ""
@@ -29226,5 +29317,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3226
+#: build/trans_presets.java:3232
 msgid "Edit Boundary"
 msgstr ""
@@ -29232,36 +29323,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3236
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3231
+#: build/trans_presets.java:3237
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3242
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3243
 msgid "Administration centre"
 msgstr ""
@@ -29269,5 +29360,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3246
 msgid "Turn restriction"
 msgstr ""
@@ -29276,5 +29367,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3249
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29282,34 +29373,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3251
 msgid "only_straight_on"
 msgstr ""
@@ -29318,15 +29409,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3256
 msgid "from way"
 msgstr "from 路徑"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3257
 msgid "via node or way"
 msgstr "via 節點或路徑"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3252
+#: build/trans_presets.java:3258
 msgid "to way"
 msgstr "to 路徑"
@@ -29334,5 +29425,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3261
 msgid "Route"
 msgstr "路線"
@@ -29341,5 +29432,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3264
 msgid "Edit Route"
 msgstr "編輯路線"
@@ -29347,5 +29438,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "Route type"
 msgstr "路線類型"
@@ -29453,5 +29544,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3260 build/trans_style.java:233
+#: build/trans_presets.java:3266 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29462,17 +29553,17 @@
 msgstr "單車"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "bus"
 msgstr "公車"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "road"
 msgstr "道路"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ferry"
 msgstr "渡輪"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "ski"
 msgstr ""
@@ -29540,5 +29631,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3260 build/trans_style.java:247
+#: build/trans_presets.java:3266 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29548,9 +29639,9 @@
 msgstr "步行"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "tram"
 msgstr "路面電車"
 
-#: build/trans_presets.java:3260
+#: build/trans_presets.java:3266
 msgid "detour"
 msgstr ""
@@ -29564,10 +29655,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3260 build/trans_style.java:1233
+#: build/trans_presets.java:3266 build/trans_style.java:1233
 msgid "subway"
 msgstr "地下鐵"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3263
+#: build/trans_presets.java:3269
 msgid "Symbol description"
 msgstr ""
@@ -29575,31 +29666,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3272
 msgid "Network"
 msgstr "網路"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3268
+#: build/trans_presets.java:3274
 msgid "connection"
 msgstr "連線"
 
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3275
 msgid "Color (hex)"
 msgstr "顏色(16 進制)"
@@ -29608,30 +29699,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3278
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:3279
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3280
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3281
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3276
+#: build/trans_presets.java:3282
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3277
+#: build/trans_presets.java:3283
 msgid "backward halt point"
 msgstr ""
@@ -29858,5 +29949,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:4144
+#: build/trans_style.java:633 build/trans_style.java:4152
 msgid "deprecated"
 msgstr "已廢棄"
@@ -30509,4 +30600,12 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="flagpole"/>
+#. color manmade
+#. <icon annotate="true" src="misc/flag.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="gasometer"/>
 #. <icon annotate="true" src="misc/landmark/gasometer.png"/>
@@ -30610,11 +30709,11 @@
 #: build/trans_style.java:1134 build/trans_style.java:1135
 #: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1644
-#: build/trans_style.java:1652 build/trans_style.java:1684
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1652 build/trans_style.java:1660
 #: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1715
-#: build/trans_style.java:1724 build/trans_style.java:1732
+#: build/trans_style.java:1708 build/trans_style.java:1716
+#: build/trans_style.java:1723 build/trans_style.java:1732
 #: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756
+#: build/trans_style.java:1756 build/trans_style.java:1764
 msgid "manmade"
 msgstr ""
@@ -31127,5 +31226,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1659 build/trans_style.java:1660
+#: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
 msgstr ""
@@ -31139,5 +31238,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1668
+#: build/trans_style.java:1676
 msgid "pipeline"
 msgstr ""
@@ -31281,13 +31380,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1766 build/trans_style.java:1774
-#: build/trans_style.java:1782 build/trans_style.java:1790
-#: build/trans_style.java:1798 build/trans_style.java:1806
-#: build/trans_style.java:1822 build/trans_style.java:1830
-#: 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:1774 build/trans_style.java:1782
+#: build/trans_style.java:1790 build/trans_style.java:1798
+#: build/trans_style.java:1806 build/trans_style.java:1814
+#: build/trans_style.java:1830 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
 msgid "leisure"
 msgstr ""
@@ -31301,5 +31400,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1814
+#: build/trans_style.java:1822
 msgid "marina"
 msgstr ""
@@ -31395,10 +31494,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1912 build/trans_style.java:1920
-#: build/trans_style.java:1928 build/trans_style.java:1936
-#: build/trans_style.java:1944 build/trans_style.java:1952
-#: build/trans_style.java:1960 build/trans_style.java:1968
-#: build/trans_style.java:1976 build/trans_style.java:1984
-#: build/trans_style.java:1992
+#: build/trans_style.java:1920 build/trans_style.java:1928
+#: build/trans_style.java:1936 build/trans_style.java:1944
+#: build/trans_style.java:1952 build/trans_style.java:1960
+#: build/trans_style.java:1968 build/trans_style.java:1976
+#: build/trans_style.java:1984 build/trans_style.java:1992
+#: build/trans_style.java:2000
 msgid "amenity"
 msgstr ""
@@ -31500,10 +31599,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2000 build/trans_style.java:2008
-#: 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:2071
-#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2008 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:2079
+#: build/trans_style.java:2088 build/trans_style.java:2096
 msgid "amenity_traffic"
 msgstr ""
@@ -31941,24 +32040,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2103 build/trans_style.java:2118
-#: build/trans_style.java:2126 build/trans_style.java:2134
-#: build/trans_style.java:2149 build/trans_style.java:2157
-#: build/trans_style.java:2165 build/trans_style.java:2173
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2303 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2456 build/trans_style.java:2463
-#: build/trans_style.java:2471 build/trans_style.java:2479
-#: 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:2576
-#: build/trans_style.java:2591
+#: build/trans_style.java:2111 build/trans_style.java:2126
+#: build/trans_style.java:2134 build/trans_style.java:2142
+#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2173 build/trans_style.java:2181
+#: build/trans_style.java:2296 build/trans_style.java:2304
+#: build/trans_style.java:2311 build/trans_style.java:2320
+#: build/trans_style.java:2328 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:2431 build/trans_style.java:2439
+#: build/trans_style.java:2447 build/trans_style.java:2456
+#: build/trans_style.java:2464 build/trans_style.java:2471
+#: build/trans_style.java:2479 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:2584
+#: build/trans_style.java:2599
 msgid "amenity_light"
 msgstr ""
@@ -31990,6 +32089,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2181 build/trans_style.java:2189
-#: build/trans_style.java:3436
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:3444
 msgid "light_water"
 msgstr ""
@@ -32050,8 +32149,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2367 build/trans_style.java:2375
-#: build/trans_style.java:2383 build/trans_style.java:2392
-#: build/trans_style.java:2399 build/trans_style.java:2407
-#: build/trans_style.java:2415
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2400
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423
 msgid "health"
 msgstr ""
@@ -32404,26 +32503,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2601 build/trans_style.java:2609
-#: build/trans_style.java:2617 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:2938
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: 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:2946
 msgid "shop"
 msgstr ""
@@ -32495,8 +32594,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2948 build/trans_style.java:2956
-#: build/trans_style.java:2964 build/trans_style.java:2972
-#: build/trans_style.java:2980 build/trans_style.java:2988
-#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:2956 build/trans_style.java:2964
+#: build/trans_style.java:2972 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
 msgid "hotel"
 msgstr "旅館"
@@ -32597,9 +32696,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3012 build/trans_style.java:3020
-#: build/trans_style.java:3028 build/trans_style.java:3036
-#: build/trans_style.java:3044 build/trans_style.java:3052
-#: build/trans_style.java:3053 build/trans_style.java:3061
-#: build/trans_style.java:3077 build/trans_style.java:3099
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3036 build/trans_style.java:3044
+#: build/trans_style.java:3052 build/trans_style.java:3060
+#: build/trans_style.java:3061 build/trans_style.java:3069
+#: build/trans_style.java:3085 build/trans_style.java:3107
 msgid "tourism"
 msgstr ""
@@ -32687,9 +32786,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3109 build/trans_style.java:3117
-#: build/trans_style.java:3125 build/trans_style.java:3133
-#: 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:3117 build/trans_style.java:3125
+#: build/trans_style.java:3133 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
 msgid "historic"
 msgstr ""
@@ -32702,5 +32801,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3229
+#: build/trans_style.java:3237
 msgid "quarry"
 msgstr ""
@@ -32714,5 +32813,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3245
 msgid "landfill"
 msgstr ""
@@ -32734,5 +32833,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3245 build/trans_style.java:3253
+#: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
 msgstr ""
@@ -32746,5 +32845,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3293
+#: build/trans_style.java:3301
 msgid "farmyard"
 msgstr ""
@@ -32767,5 +32866,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3302 build/trans_style.java:3310
+#: build/trans_style.java:3310 build/trans_style.java:3318
 msgid "retail"
 msgstr ""
@@ -32779,5 +32878,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "industrial"
 msgstr ""
@@ -32791,5 +32890,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "brownfield"
 msgstr ""
@@ -32803,5 +32902,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "greenfield"
 msgstr ""
@@ -32815,5 +32914,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "railland"
 msgstr ""
@@ -32870,7 +32969,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3359 build/trans_style.java:3394
-#: build/trans_style.java:3402 build/trans_style.java:3410
-#: build/trans_style.java:3418 build/trans_style.java:3426
+#: build/trans_style.java:3367 build/trans_style.java:3402
+#: build/trans_style.java:3410 build/trans_style.java:3418
+#: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
 msgstr ""
@@ -32884,5 +32983,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "cemetery"
 msgstr ""
@@ -32895,5 +32994,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3443
+#: build/trans_style.java:3451
 msgid "peak"
 msgstr ""
@@ -32908,5 +33007,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3452
+#: build/trans_style.java:3460
 msgid "glacier"
 msgstr ""
@@ -32920,5 +33019,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3468
 msgid "volcano"
 msgstr "火山"
@@ -32973,8 +33072,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3468 build/trans_style.java:3469
-#: build/trans_style.java:3477 build/trans_style.java:3493
-#: build/trans_style.java:3557 build/trans_style.java:3565
-#: build/trans_style.java:3573
+#: build/trans_style.java:3476 build/trans_style.java:3477
+#: build/trans_style.java:3485 build/trans_style.java:3501
+#: build/trans_style.java:3565 build/trans_style.java:3573
+#: build/trans_style.java:3581
 msgid "natural"
 msgstr ""
@@ -32988,5 +33087,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3485
+#: build/trans_style.java:3493
 msgid "scrub"
 msgstr ""
@@ -33000,5 +33099,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3501
+#: build/trans_style.java:3509
 msgid "heath"
 msgstr ""
@@ -33012,5 +33111,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3517
 msgid "woodarea"
 msgstr "樹林區"
@@ -33024,5 +33123,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3541
+#: build/trans_style.java:3549
 msgid "mud"
 msgstr ""
@@ -33036,5 +33135,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3557
 msgid "beach"
 msgstr "海灘"
@@ -33112,8 +33211,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3589 build/trans_style.java:3597
-#: build/trans_style.java:3605 build/trans_style.java:3613
-#: build/trans_style.java:3621 build/trans_style.java:3629
-#: build/trans_style.java:3637 build/trans_style.java:3645
+#: build/trans_style.java:3597 build/trans_style.java:3605
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
 msgid "route"
 msgstr "路線"
@@ -33202,12 +33301,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3667 build/trans_style.java:3671
+#: build/trans_style.java:3663 build/trans_style.java:3671
 #: build/trans_style.java:3675 build/trans_style.java:3679
 #: build/trans_style.java:3683 build/trans_style.java:3687
 #: build/trans_style.java:3691 build/trans_style.java:3695
-#: build/trans_style.java:3699 build/trans_style.java:3704
-#: build/trans_style.java:3712 build/trans_style.java:3720
-#: build/trans_style.java:3728
+#: build/trans_style.java:3699 build/trans_style.java:3703
+#: build/trans_style.java:3707 build/trans_style.java:3712
+#: build/trans_style.java:3720 build/trans_style.java:3728
+#: build/trans_style.java:3736
 msgid "boundary"
 msgstr "邊界"
@@ -33357,11 +33456,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4192 build/trans_style.java:4200
-#: build/trans_style.java:4208 build/trans_style.java:4216
-#: build/trans_style.java:4224 build/trans_style.java:4232
-#: 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:4200 build/trans_style.java:4208
+#: build/trans_style.java:4216 build/trans_style.java:4224
+#: build/trans_style.java:4232 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
 msgid "place"
 msgstr ""
@@ -33375,5 +33474,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4296
+#: build/trans_style.java:4304
 msgid "tiger_data"
 msgstr ""
@@ -33729,9 +33828,16 @@
 msgstr ""
 
-#~ msgid "closedway"
-#~ msgstr "封閉路徑"
-
-#~ msgid "Target of type {0} with id {1} has invalid version"
-#~ msgstr "id {1} 類型 {0} 的目標有無效的版本"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "選取的路徑未包含選取的節點。"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "度-分-秒格式"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "請輸入上傳備註（最小 3 個字元）"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "請輸入這個上傳變更組合的註解 (最少 3 個字元)"
 
 #~ msgid "Open in Browser"
@@ -34031,4 +34137,7 @@
 #~ msgid "Create non-audio markers when reading GPX."
 #~ msgstr "讀取 GPX 時建立非音效標記。"
+
+#~ msgid "closedway"
+#~ msgstr "封閉路徑"
 
 #~ msgid "Contact {0}..."
@@ -34558,7 +34667,4 @@
 #~ "許多能讓您的生活更輕鬆的公用程式：例如簡化路徑、連結區域、跳至位置。"
 
-#~ msgid "Boat"
-#~ msgstr "小船"
-
 #~ msgid "Motorboat"
 #~ msgstr "動力小船"
@@ -35021,4 +35127,7 @@
 #~ msgstr "點到建築的一角以開始繪製"
 
+#~ msgid "Target of type {0} with id {1} has invalid version"
+#~ msgstr "id {1} 類型 {0} 的目標有無效的版本"
+
 #~ msgid ""
 #~ "<html>To keep your local version, JOSM<br>has to reset the id of "